fix(ci): Only use locked flag if lockfile exists (#12)

noir-lang · Feb 16, 2023 · 7d05728 · 7d05728
1 parent 56e7574
commit 7d05728
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml
@@ -28,7 +28,14 @@ jobs:
       - name: Install dependencies
         run: sudo apt update && sudo apt install libomp-dev
 
+      - name: Check for lockfile
+        working-directory: ${{ inputs.working-directory }}
+        run: |
+          if [ -f Cargo.lock ]; then
+            echo "LOCKED_FLAG=--locked" >> $GITHUB_ENV
+          fi
+
       - name: Run cargo clippy
         working-directory: ${{ inputs.working-directory }}
         run: |
-          cargo clippy --locked -- -D warnings
+          cargo clippy ${{ env.LOCKED_FLAG }} -- -D warnings
diff --git a/.github/workflows/rust-test.yml b/.github/workflows/rust-test.yml
@@ -60,10 +60,17 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Check for lockfile
+        working-directory: ${{ inputs.working-directory }}
+        run: |
+          if [ -f Cargo.lock ]; then
+            echo "LOCKED_FLAG=--locked" >> $GITHUB_ENV
+          fi
+
       - name: Run cargo test
         working-directory: ${{ inputs.working-directory }}
         run: |
-          cargo test --locked -- --test-threads=1
+          cargo test ${{ env.LOCKED_FLAG }} -- --test-threads=1
 
   test_clang10:
     name: Test with clang 10
@@ -103,7 +110,14 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Check for lockfile
+        working-directory: ${{ inputs.working-directory }}
+        run: |
+          if [ -f Cargo.lock ]; then
+            echo "LOCKED_FLAG=--locked" >> $GITHUB_ENV
+          fi
+
       - name: Run cargo test
         working-directory: ${{ inputs.working-directory }}
         run: |
-          cargo test --locked -- --test-threads=1
+          cargo test ${{ env.LOCKED_FLAG }} -- --test-threads=1