clean up CI

solana-labs · Oct 17, 2024 · 404466d · 404466d
1 parent 8750d1c
commit 404466d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 53 deletions.
diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml
@@ -3,58 +3,6 @@ name: Account Compression Pull Request
 on: workflow_dispatch
 
 jobs:
-  anchor-build-account-compression:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set env vars
-        run: |
-          source ci/rust-version.sh
-          echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
-          source ci/solana-version.sh
-          echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
-          source ci/install-anchor.sh
-          echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV
-
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.RUST_STABLE }}
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }}
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/rustfilt
-          key: cargo-sbf-bins-${{ runner.os }}
-
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/solana
-          key: solana-${{ env.SOLANA_VERSION }}
-
-      - name: Install dependencies
-        run: |
-          ./ci/install-build-deps.sh
-          ./ci/install-program-deps.sh
-          echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
-
-      - name: Build and test programs
-        run: ./ci/cargo-test-sbf.sh account-compression
-
-      - name: Upload programs
-        uses: actions/upload-artifact@v3
-        with:
-          name: account-compression-programs
-          path: "account-compression/target/deploy/*.so"
-          if-no-files-found: error
-
   js-test-account-compression:
     runs-on: ubuntu-latest
     env:
@@ -73,3 +21,10 @@ jobs:
           restore-keys: |
             node-
       - run: ./ci/js-test-account-compression.sh
+      - uses: actions/upload-artifact@v3
+        with:
+          name: account-compression-programs
+          path: |
+            target/deploy/spl_account_compression.so
+            target/deploy/spl_noop.so
+          if-no-files-found: error
diff --git a/ci/js-test-account-compression.sh b/ci/js-test-account-compression.sh
@@ -3,11 +3,12 @@
 set -e
 cd "$(dirname "$0")/.."
 source ./ci/solana-version.sh install
+cargo install solana-verify
 
 set -x
+solana-verify build --library-name spl_account_compression && solana-verify build --library-name spl_noop
 cd account-compression/sdk
 pnpm install
 pnpm build
-pnpm build:program
 pnpm lint
 pnpm test