Resolve issue with Rust-Cache action failing silently

Resolve issue with Rust-Cache action failing silently Resolve issue with benchmarks being triggered even when the pre-requisite workflow failed.
esrlabs · Dec 6, 2024 · d355970 · d355970
1 parent 642540a
commit d355970
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   invoke_jasmine_tests:
     name: Invoke Jasmine performance tests
-    if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event_name }}" == 'workflow_dispatch'
+    if: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch' }}
     runs-on: self-hosted-runner-ubuntu
     steps:
       - name: Cleanup build folder

diff --git a/.github/workflows/lint_master.yml b/.github/workflows/lint_master.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - issue_2083
 
 jobs:
   rust_and_ts_lint:
@@ -27,11 +26,12 @@ jobs:
           override: true
       - name: Cache Rust dependencies and CLI tool
         id: cache-cargo
-        uses: Swatinem/rust-cache@v2.7.3
+        uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ runner.os }}-cargo-${{ hashFiles('cli/Cargo.toml', 'cli/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           cache-targets: true
           cache-all-crates: "true"
+          workspaces: cli
       - name: Install nj-cli
         run: cargo install nj-cli
       - name: enable corepack for yarnpkg upgrade
@@ -76,11 +76,12 @@ jobs:
           override: true
       - name: Cache Rust dependencies and CLI tool
         id: cache-cargo
-        uses: Swatinem/rust-cache@v2.7.3
+        uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ runner.os }}-cargo-${{ hashFiles('cli/Cargo.toml', 'cli/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           cache-targets: true
           cache-all-crates: "true"
+          workspaces: cli
       - name: Install nj-cli
         run: cargo install nj-cli
       - name: enable corepack for yarnpkg upgrade

diff --git a/.github/workflows/pullrequest_check.yml b/.github/workflows/pullrequest_check.yml
@@ -30,11 +30,12 @@ jobs:
           override: true
       - name: Cache Rust dependencies and CLI tool
         id: cache-cargo
-        uses: Swatinem/rust-cache@v2.7.3
+        uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ runner.os }}-cargo-${{ hashFiles('cli/Cargo.toml', 'cli/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           cache-targets: true
           cache-all-crates: "true"
+          workspaces: cli
       - name: Install nj-cli
         run: cargo install nj-cli
       - name: enable corepack for yarnpkg upgrade
@@ -78,11 +79,12 @@ jobs:
           override: true
       - name: Cache Rust dependencies and CLI tool
         id: cache-cargo
-        uses: Swatinem/rust-cache@v2.7.3
+        uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ runner.os }}-cargo-${{ hashFiles('cli/Cargo.toml', 'cli/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           cache-targets: true
           cache-all-crates: "true"
+          workspaces: cli
       - name: Install nj-cli
         run: cargo install nj-cli
       - name: enable corepack for yarnpkg upgrade