Merge pull request #3532 from rina23q/ci/move-cargo-test-to-build-workflow

ci: move cargo-test job to build-workflow

Author: rina23q

.github/workflows/build-workflow.yml

@@ -31,6 +31,63 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  cargo-test:
+    name: Run cargo test
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check disk space before setting up
+        run: df -BM
+
+      - name: Reclaim some disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf /opt/hostedtoolcache
+
+      - name: Check disk space after freeing
+        run: df -BM
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Retrieve MSRV from workspace Cargo.toml
+        id: rust_version
+        uses: SebRollen/[email protected]
+        with:
+          file: Cargo.toml
+          field: "workspace.package.rust-version"
+
+      - name: Enable toolchain via github action
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: llvm-tools-preview
+
+      - name: Enable cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Install latest nextest release
+        uses: taiki-e/install-action@nextest
+
+      - name: cargo install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+
+      - name: cargo llvm-cov
+        run: cargo llvm-cov nextest --no-fail-fast --locked --all-features --all-targets --codecov --output-path codecov.json
+
+      # https://github.com/rust-lang/cargo/issues/6669
+      - name: cargo test --doc
+        run: cargo test --locked --all-features --doc
+
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+
+      - name: Check disk space after completing workflow
+        run: df -BM
+
   build:
     name: Build ${{ matrix.target }}
     runs-on: ${{ matrix.host_os }}
@@ -259,7 +316,7 @@ jobs:
       (needs.check-build.result == 'success') &&
       (needs.test.result == 'success' || needs.test.result == 'skipped')
     runs-on: ubuntu-22.04
-    needs: [check-build, test]
+    needs: [check-build, test, cargo-test]
     strategy:
       fail-fast: false
       matrix:
@@ -314,7 +371,7 @@ jobs:
       (needs.check-build.result == 'success') &&
       (needs.test.result == 'success' || needs.test.result == 'skipped')
     runs-on: ubuntu-22.04
-    needs: [check-build, test]
+    needs: [check-build, test, cargo-test]
     env:
       BUILDX_NO_DEFAULT_ATTESTATIONS: 1
     permissions:

.github/workflows/pull-request-checks.yml

@@ -24,6 +24,7 @@ jobs:
   changes:
     name: Filter changes
     runs-on: ubuntu-22.04
+    if: ${{ github.event_name != 'merge_group' }}
     # Set job outputs to values from filter step
     outputs:
       rust: ${{ steps.filter.outputs.rust || 'true' }}
@@ -42,6 +43,7 @@ jobs:
               - 'crates/**'
               - 'plugins/**'
               - 'Cargo.*'
+              - '**/Cargo.toml'
             workflows:
               - '.github/workflows/**'
             docs:
@@ -53,9 +55,8 @@ jobs:
   check-lockfile-uptodate:
     name: Check whether Cargo.lock is up to date
     runs-on: ubuntu-22.04
-    if: ${{ github.event_name == 'pull_request' }}
-    outputs:
-      locks: ${{ steps.filter.outputs.locks }}
+    needs: changes
+    if: ${{ needs.changes.outputs.rust == 'true' || needs.changes.outputs.workflows == 'true' }}
     steps:
       - uses: actions/checkout@v4
 
@@ -74,15 +75,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            locks:
-              - '**/Cargo.toml'
-
       - name: Check whether lockfile is up to date
-        if: steps.filter.outputs.locks == 'true'
         run: cargo check --locked
 
   udeps:
@@ -253,65 +246,6 @@ jobs:
       - name: Run `cargo check`
         run: cargo check --all-targets --all-features
 
-  cargo-test:
-    name: Run cargo test
-    runs-on: ubuntu-22.04
-    needs: changes
-    if: ${{ needs.changes.outputs.rust == 'true' || needs.changes.outputs.workflows == 'true' }}
-    steps:
-      - name: Check disk space before setting up
-        run: df -BM
-
-      - name: Reclaim some disk space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf /opt/hostedtoolcache
-
-      - name: Check disk space after freeing
-        run: df -BM
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Retrieve MSRV from workspace Cargo.toml
-        id: rust_version
-        uses: SebRollen/[email protected]
-        with:
-          file: Cargo.toml
-          field: "workspace.package.rust-version"
-
-      - name: Enable toolchain via github action
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: llvm-tools-preview
-
-      - name: Enable cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Install latest nextest release
-        uses: taiki-e/install-action@nextest
-
-      - name: cargo install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
-
-      - name: cargo llvm-cov
-        run: cargo llvm-cov nextest --no-fail-fast --locked --all-features --all-targets --codecov --output-path codecov.json
-
-      # https://github.com/rust-lang/cargo/issues/6669
-      - name: cargo test --doc
-        run: cargo test --locked --all-features --doc
-
-      - name: Upload to codecov.io
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: false
-
-      - name: Check disk space after completing workflow
-        run: df -BM
-
   shellcheck:
     name: Shellcheck
     runs-on: ubuntu-latest