Update scripts

Author: joncinque

.github/workflows/main.yml

@@ -143,6 +143,12 @@ jobs:
         with:
           solana: true
 
+      - name: Restore Program Builds
+        uses: actions/cache/restore@v4
+        with:
+          path: ./**/*.so
+          key: ${{ runner.os }}-builds-${{ github.sha }}
+
       - name: Test Client JS
         run: pnpm clients:js:test
 
@@ -160,5 +166,11 @@ jobs:
           cargo-cache-key: cargo-rust-client
           solana: true
 
+      - name: Restore Program Builds
+        uses: actions/cache/restore@v4
+        with:
+          path: ./**/*.so
+          key: ${{ runner.os }}-builds-${{ github.sha }}
+
       - name: Test Client Rust
         run: pnpm clients:rust:test

scripts/program/build.mjs

@@ -6,17 +6,8 @@ import {
   workingDirectory,
 } from '../utils.mjs';
 
-// Save external programs binaries to the output directory.
-import './dump.mjs';
-
-// Configure arguments here.
-const buildArgs = [
-  ...cliArguments()
-];
-
 // Build the programs.
 for (const folder of getProgramFolders()) {
   const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
-
-  await $`cargo-build-sbf --manifest-path ${manifestPath} ${buildArgs}`;
+  await $`cargo-build-sbf --manifest-path ${manifestPath} ${cliArguments()}`;
 }

scripts/program/dump.mjs

@@ -6,21 +6,15 @@ import {
   workingDirectory,
 } from '../utils.mjs';
 
-// Save external programs binaries to the output directory.
-import './dump.mjs';
-
-// Configure arguments here.
-const testArgs = ['--features', 'bpf-entrypoint', ...cliArguments()];
-
 const hasSolfmt = await which('solfmt', { nothrow: true });
 
 // Test the programs.
 for (const folder of getProgramFolders()) {
   const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
 
   if (hasSolfmt) {
-    await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${testArgs} 2>&1 | solfmt`;
+    await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${cliArguments()} 2>&1 | solfmt`;
   } else {
-    await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${testArgs}`;
+    await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${cliArguments()}`;
   }
 }