Trying different approach for CI stable vs beta

mobilecoinfoundation · Oct 11, 2023 · 77a872c · 77a872c
1 parent 5a50c4c
commit 77a872c
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -65,23 +65,30 @@ jobs:
           - beta
     # Prevent beta warnings from causing CI failure
     continue-on-error: ${{ matrix.rust == 'beta' }}
-    if: ${{ matrix.rust == 'stable' }}
-    env:
-      SUPPRESSION: "-Aclippy::incorrect_clone_impl_on_copy_type"
-    if: ${{ matrix.rust == 'beta' }}
-    env:
-      SUPPRESSION: "-Aclippy::non_canonical_clone_impl"
+#    if: ${{ matrix.rust == 'stable' }}
+#    env:
+#      SUPPRESSION: "-Aclippy::incorrect_clone_impl_on_copy_type"
+#    if: ${{ matrix.rust == 'beta' }}
+#    env:
+#      SUPPRESSION: "-Aclippy::non_canonical_clone_impl"
     steps:
       - uses: actions/checkout@v4
       - uses: mobilecoinfoundation/actions/dcap-libs@main
         with:
           version: 1.16.100.2-jammy1
+      - id: suppression
+        run: |
+          if [ "${{ matrix.rust }}" == "stable" ]; then
+            echo "suppression=-Aclippy::incorrect_clone_impl_on_copy_type" >> "$GITHUB_OUTPUT"
+          elif [ "${{ matrix.rust }}" == "beta" ]; then
+            echo "suppression=-Aclippy::non_canonical_clone_impl" >> "$GITHUB_OUTPUT"
+          fi
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
           components: clippy
       - uses: r7kamura/rust-problem-matchers@v1
-      - run: cargo +${{ matrix.rust }} clippy --all --all-features -- -D warnings $SUPPRESSION
+      - run: cargo +${{ matrix.rust }} clippy --all --all-features -- -D warnings ${{ steps.suppression.outputs.suppression }}
 
   build:
     runs-on: ubuntu-22.04