From 6c5b3463135d52b57345e6ad4af651ee37a750e6 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 30 Oct 2024 18:54:22 +0100 Subject: [PATCH] Update CI jobs --- .github/workflows/pull-request-account-compression.yml | 5 ++++- .github/workflows/pull-request-token.yml | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index 48f63c7a9a6..6e925fb27ab 100644 --- 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 index db250efb876..18ed249ef75 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -205,7 +205,6 @@ 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 @@ -213,7 +212,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ env.RUST_STABLE_VERSION }} + toolchain: ${{ env.RUST_STABLE }} - uses: actions/cache@v4 with: