CI: Only build shapely from src on Minimum runs

Unidata · Oct 30, 2023 · 3dd466c · 3dd466c
1 parent 70b16f4
commit 3dd466c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/actions/install-pypi/action.yml b/.github/actions/install-pypi/action.yml
@@ -15,6 +15,10 @@ inputs:
   python-version:
     description: 'What version of Python to use'
     required: true
+  old-build:
+    description: 'Whether to enable old builds for shapely and cartopy'
+    required: false
+    default: false
 
 runs:
   using: composite
@@ -30,13 +34,13 @@ runs:
           ci/extra_requirements.txt
 
     # This installs the stuff needed to build and install Shapely and CartoPy from source.
-    - name: Install CartoPy build dependencies
-      if: ${{ inputs.need-extras == 'true' }}
+    - name: Install CartoPy/Shapely build dependencies
+      if: ${{ inputs.old-build == 'true' }}
       shell: bash
       run: sudo apt-get install libgeos-dev
 
     - name: Disable Shapely Wheels
-      if: ${{ inputs.need-extras == 'true' }}
+      if: ${{ inputs.old-build == 'true' }}
       shell: bash
       run: echo "PIP_NO_BINARY=shapely" >> $GITHUB_ENV
 

diff --git a/.github/workflows/tests-pypi.yml b/.github/workflows/tests-pypi.yml
@@ -72,6 +72,7 @@ jobs:
         need-extras: ${{ matrix.no-extras != 'No Extras' }}
         type: 'test'
         python-version: ${{ matrix.python-version }}
+        old-build: ${{ matrix.no-extras != 'No Extras' && matrix.dep-versions == 'Minimum' }}
 
     - name: Run tests
       uses: ./.github/actions/run-tests