solana: update to 2.1 (#86)

rpcpool · Feb 8, 2025 · c2ae96d · c2ae96d
1 parent f157511
commit c2ae96d
Show file tree

Hide file tree

Showing 11 changed files with 894 additions and 422 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Set rust version
         run: |
           RUST_VERSION="$(grep -oP 'channel = "\K\d\.\d+\.\d+(?=")' rust-toolchain.toml)"
-          echo "RUST_VERSION=$RUST_VERSION" >> "$GITHUB_ENV"
+          echo "RUST_STABLE_VERSION=$RUST_VERSION" >> "$GITHUB_ENV"
 
       - name: Set env vars
         run: |
@@ -97,7 +97,7 @@ jobs:
           body: |
             ${{ env.GEYSER_PLUGIN_NAME }} ${{ env.CI_TAG }}
             solana ${{ env.SOLANA_VERSION }}
-            rust ${{ env.RUST_VERSION }}
+            rust ${{ env.RUST_STABLE_VERSION }}
           files: |
             ${{ env.GEYSER_PLUGIN_NAME }}-release*
             target/release/config*

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set rust version
         run: |
           RUST_VERSION="$(grep -oP 'channel = "\K\d\.\d+\.\d+(?=")' rust-toolchain.toml)"
-          echo "RUST_VERSION=$RUST_VERSION" >> "$GITHUB_ENV"
+          echo "RUST_STABLE_VERSION=$RUST_VERSION" >> "$GITHUB_ENV"
 
       - name: Set env vars
         run: |
@@ -61,7 +61,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ env.RUST_VERSION }}
+          toolchain: ${{ env.RUST_STABLE_VERSION }}
           components: clippy
 
       - name: cargo tree