try fix build syntax

PyO3 · Jun 21, 2024 · 6cc3b77 · 6cc3b77
1 parent 28d2579
commit 6cc3b77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,9 +16,9 @@ on:
       rust-target:
         required: true
         type: string
-      msrv:
-        default: false
-        type: boolean
+      MSRV:
+        required: true
+        type: string
 
 jobs:
   build:
@@ -54,7 +54,7 @@ jobs:
         name: Prepare LD_LIBRARY_PATH (Ubuntu only)
         run: echo LD_LIBRARY_PATH=${pythonLocation}/lib >> $GITHUB_ENV
 
-      - if: inputs.msrv
+      - if: inputs.rust == inputs.MSRV
         name: Prepare MSRV package versions
         run: nox -s set-msrv-package-versions
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -155,14 +155,15 @@ jobs:
   build-pr:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-build-full') && github.event_name == 'pull_request' }}
     name: python${{ matrix.python-version }}-${{ matrix.platform.python-architecture }} ${{ matrix.platform.os }} rust-${{ matrix.rust }}
-    needs: [fmt]
+    needs: [fmt, resolve]
     uses: ./.github/workflows/build.yml
     with:
       os: ${{ matrix.platform.os }}
       python-version: ${{ matrix.python-version }}
       python-architecture: ${{ matrix.platform.python-architecture }}
       rust: ${{ matrix.rust }}
       rust-target: ${{ matrix.platform.rust-target }}
+      MSRV: ${{ needs.resolve.outputs.MSRV }}
     secrets: inherit
     strategy:
       # If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
@@ -220,14 +221,13 @@ jobs:
       python-architecture: ${{ matrix.platform.python-architecture }}
       rust: ${{ matrix.rust }}
       rust-target: ${{ matrix.platform.rust-target }}
-      msrv: ${{ matrix.msrv }}
+      MSRV: ${{ needs.resolve.outputs.MSRV }}
     secrets: inherit
     strategy:
       # If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
       fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
       matrix:
         rust: [stable]
-        msrv: [false]
         python-version: [
           "3.7",
           "3.8",
@@ -267,8 +267,7 @@ jobs:
           ]
         include:
           # Test minimal supported Rust version
-          - msrv: true
-            rust: ${{ needs.resolve.outputs.MSRV }}
+          - rust: ${{ needs.resolve.outputs.MSRV }}
             python-version: "3.12"
             platform:
               {