ci: attempt to speed up ci by agressive cache reuse

bmuddha · bmuddha · commit 975f378c642d · 2025-12-19T18:47:36.000+04:00
diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
@@ -24,8 +24,9 @@ runs:
       repo-token: ${{ inputs.github_token }}
 
   - name: Install Rust
-    shell: "bash"
-    run: rustup toolchain install ${{ inputs.rust_toolchain_release }} --profile default
+    uses: dtolnay/rust-toolchain@master
+    with:
+      toolchain: ${{ inputs.rust_toolchain_release }}
 
   - name: Install system deps (libudev, LLVM/Clang)
     if: runner.os == 'Linux'
@@ -41,7 +42,7 @@ runs:
       shared-key: ${{ inputs.build_cache_key_name }}
       workspaces: |
         magicblock-validator -> target
-        magicblock-validator/test-integration -> target
+        magicblock-validator/test-integration -> test-integration/target
       cache-targets: true
       cache-all-crates: true
       cache-on-failure: true
diff --git a/.github/actions/setup-solana/action.yml b/.github/actions/setup-solana/action.yml
@@ -4,10 +4,18 @@ description: 'Install Solana Test Validator and ensure it works'
 runs:
   using: "composite"
   steps:
+      - name: Cache Solana toolchain
+        uses: actions/cache@v3
+        with:
+          path: ~/.local/share/solana
+          key: solana-v2.2.20-${{ runner.os }}
+
       - name: Install Solana Test Validator
         shell: "bash"
         run: |
-          sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.20/install)"
+          if [ ! -f ~/.local/share/solana/install/active_release/bin/solana-test-validator ]; then
+            sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.20/install)"
+          fi
           echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
 
       - name: Ensure Solana Test Validator is Installed
diff --git a/.github/workflows/ci-fmt.yml b/.github/workflows/ci-fmt.yml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
-          build_cache_key_name: "magicblock-validator-ci-fmt-v001"
+          build_cache_key_name: "magicblock-validator-ci-fmt-${{ hashFiles('magicblock-validator/Cargo.lock', 'magicblock-validator/test-integration/Cargo.lock') }}-v001"
           rust_toolchain_release: "nightly"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
-          build_cache_key_name: "magicblock-validator-ci-lint-v002"
+          build_cache_key_name: "magicblock-validator-${{ hashFiles('magicblock-validator/Cargo.lock', 'magicblock-validator/test-integration/Cargo.lock') }}-v001"
           rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci-test-integration.yml b/.github/workflows/ci-test-integration.yml
@@ -23,7 +23,7 @@ jobs:
 
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
-          build_cache_key_name: "magicblock-validator-ci-test-integration-${{ github.ref_name }}-${{ hashFiles('magicblock-validator/Cargo.lock') }}"
+          build_cache_key_name: "magicblock-validator-${{ hashFiles('magicblock-validator/Cargo.lock', 'magicblock-validator/test-integration/Cargo.lock') }}-v001"
           rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -37,6 +37,23 @@ jobs:
         shell: bash
         working-directory: magicblock-validator
 
+      - name: Build test-runner binary
+        run: cargo build --package test-runner --bin run-tests --locked
+        shell: bash
+        working-directory: magicblock-validator
+
+      - name: Pre-build all test binaries
+        run: cargo build --tests --locked
+        shell: bash
+        working-directory: magicblock-validator/test-integration
+
+      - name: Upload test-runner binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-runner-binary
+          path: magicblock-validator/test-integration/target/debug/run-tests
+          retention-days: 1
+
   run_integration_tests:
     needs: build
     runs-on: ubuntu-latest-m
@@ -64,13 +81,23 @@ jobs:
 
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
-          build_cache_key_name: "magicblock-validator-ci-test-integration-${{ github.ref_name }}-${{ hashFiles('magicblock-validator/Cargo.lock') }}"
-          rust_toolchain_release: "1.84.1"
+          build_cache_key_name: "magicblock-validator-${{ hashFiles('magicblock-validator/Cargo.lock', 'magicblock-validator/test-integration/Cargo.lock') }}-v001"
+          rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: ./magicblock-validator/.github/actions/setup-solana
 
+      - name: Download test-runner binary
+        uses: actions/download-artifact@v3
+        with:
+          name: test-runner-binary
+          path: magicblock-validator/test-integration/target/debug/
+
+      - name: Make test-runner binary executable
+        run: chmod +x magicblock-validator/test-integration/target/debug/run-tests
+        shell: bash
+
       - name: Run integration tests - ${{ matrix.batch_tests }}
         run: |
           sudo prlimit --pid $$ --nofile=1048576:1048576
@@ -81,3 +108,4 @@ jobs:
         working-directory: magicblock-validator
         env:
           RUN_TESTS: ${{ matrix.batch_tests }}
+          TEST_RUNNER_BIN: ${{ github.workspace }}/magicblock-validator/test-integration/target/debug/run-tests
diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
-          build_cache_key_name: "magicblock-validator-ci-test-unit-v000"
+          build_cache_key_name: "magicblock-validator-${{ hashFiles('magicblock-validator/Cargo.lock', 'magicblock-validator/test-integration/Cargo.lock') }}-v001"
           rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -64,7 +64,7 @@ jobs:
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
           build_cache_key_name: "magicblock-validator-ci-publish-v000"
-          rust_toolchain_release: "1.85.0"
+          rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/test-integration/test-runner/bin/run_tests.rs b/test-integration/test-runner/bin/run_tests.rs
@@ -783,7 +783,8 @@ fn run_test(
         "RUST_LOG",
         std::env::var("RUST_LOG").unwrap_or_else(|_| "info".to_string()),
     )
-    .arg("test");
+    .arg("test")
+    .arg("--locked");
     if let Some(package) = config.package {
         cmd.arg("-p").arg(package);
     }
diff --git a/test-integration/test-tools/src/validator.rs b/test-integration/test-tools/src/validator.rs
@@ -33,24 +33,14 @@ pub fn start_magic_block_validator_with_config(
 
     let port = rpc_port_from_config(config_path);
 
-    // First build so that the validator can start fast
-    let mut command = process::Command::new("cargo");
+    // Start validator directly from the pre-built binary
+    // (already compiled in CI build step or by local `cargo build`)
+    let validator_bin = root_dir.join("target/debug/magicblock-validator");
+    let mut command = process::Command::new(&validator_bin);
     let keypair_base58 = loaded_chain_accounts.validator_authority_base58();
-    command.arg("build");
-    let build_res = command.current_dir(root_dir.clone()).output();
-
-    if build_res.is_ok_and(|output| !output.status.success()) {
-        eprintln!("Failed to build validator");
-        return None;
-    }
-
-    // Start validator via `cargo run -- <path to config>`
-    let mut command = process::Command::new("cargo");
-    command.arg("run");
     let rust_log_style =
         std::env::var("RUST_LOG_STYLE").unwrap_or(log_suffix.to_string());
     command
-        .arg("--")
         .arg(config_path)
         .env("RUST_LOG_STYLE", rust_log_style)
         .env("MBV_VALIDATOR__KEYPAIR", keypair_base58.clone())

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,8 @@ fn run_test(`
`783`	`783`	`"RUST_LOG",`
`784`	`784`	`std::env::var("RUST_LOG").unwrap_or_else(\|_\| "info".to_string()),`
`785`	`785`	`)`
`786`		`- .arg("test");`
	`786`	`+ .arg("test")`
	`787`	`+ .arg("--locked");`
`787`	`788`	`if let Some(package) = config.package {`
`788`	`789`	`cmd.arg("-p").arg(package);`
`789`	`790`	`}`