Fix toolchain configuration

Author: febo

.github/actions/setup/action.yml

@@ -57,7 +57,7 @@ runs:
       if: ${{ inputs.solana == 'true' }}
       uses: solana-program/actions/install-solana@v1
       with:
-        version: ${{ env.SOLANA_VERSION }}
+        version: ${{ env.SOLANA_CLI_VERSION }}
         cache: true
 
     - name: Install 'cargo-audit'
@@ -88,7 +88,7 @@ runs:
       if: ${{ contains(inputs.toolchain, 'lint') }}
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: ${{ env.TOOLCHAIN_LINT }}
+        toolchain: ${{ env.RUST_TOOLCHAIN_LINT }}
         components: miri
 
     - name: Install 'cargo-spellcheck'

.github/workflows/main.yml

@@ -9,22 +9,6 @@ env:
   CACHE: true
 
 jobs:
-  spellcheck:
-    name: Spellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cargo-cache-key: cargo-spellcheck
-          components: spellcheck
-
-      - name: cargo-spellcheck
-        run: ./make spellcheck
-
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -37,7 +21,7 @@ jobs:
         with:
           cargo-cache-key: cargo-lint
           toolchain: format, lint
-          components: hack, miri
+          components: hack, miri, spellcheck
 
       - name: cargo-clippy
         run: ./make.sh clippy
@@ -54,6 +38,9 @@ jobs:
       - name: cargo-miri
         run: ./make.sh miri
 
+      - name: cargo-spellcheck
+        run: ./make.sh spellcheck
+
   build:
     name: Build
     runs-on: ubuntu-latest

.scripts/hack.sh

@@ -9,11 +9,7 @@ if [ ! -f "$MANIFEST_FILE" ]; then
     exit 1
 fi
 
-if [ ! -z "$RUST_TOOLCHAIN_LINT" ]; then
-    TOOLCHAIN="+$RUST_TOOLCHAIN_LINT"
-fi
-
 CHECK_ARGS="--all-targets \
   --feature-powerset"
 
-cargo $TOOLCHAIN hack check --manifest-path $MANIFEST_FILE $CHECK_ARGS $@
+cargo hack check --manifest-path $MANIFEST_FILE $CHECK_ARGS $@

make.sh

@@ -4,8 +4,8 @@ set -e
 
 # Export environment variables and functions.
 export RUST_TOOLCHAIN_BUILD="1.84.1"
-export RUST_TOOLCHAIN_FORMAT="nightly-2024-11-22"
-export RUST_TOOLCHAIN_LINT="nightly-2024-11-22"
+export RUST_TOOLCHAIN_FORMAT="nightly-2025-02-16"
+export RUST_TOOLCHAIN_LINT="nightly-2025-02-16"
 export RUST_TOOLCHAIN_TEST="1.84.1"
 export SOLANA_CLI_VERSION="2.3.4"
 export WORKING_DIR=$(cd $(dirname $0) && pwd)