Update CI jobs

solana-labs · Oct 30, 2024 · 6c5b346 · 6c5b346
1 parent a326b9f
commit 6c5b346
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml
@@ -32,10 +32,11 @@ jobs:
 
       - name: Set env vars
         run: |
+          echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
+          echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
           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
 
@@ -94,4 +95,6 @@ jobs:
           key: node-${{ hashFiles('pnpm-lock.yaml') }}
           restore-keys: |
             node-
+      - name: Set env vars
+        run: echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
       - run: ./ci/js-test-account-compression.sh
diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml
@@ -205,15 +205,14 @@ jobs:
 
       - name: Set env vars
         run: |
-          echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
           source ci/rust-version.sh
           echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
           source ci/solana-version.sh
           echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.RUST_STABLE_VERSION }}
+          toolchain: ${{ env.RUST_STABLE }}
 
       - uses: actions/cache@v4
         with: