more voodoo

Author: Bengt Lofgren

.github/workflows/solana.yml

@@ -54,41 +54,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      # Install Rust toolchain (if not already)
-      - name: Install Rust & components
+      - name: Install agave-install
         run: |
-          rustup toolchain install stable
-          rustup default stable
-          rustup component add rustfmt clippy
-        working-directory: ./solana
-
-      # Install native deps for OpenSSL bindings
-      - name: Install native deps for OpenSSL bindings
+          cargo install --locked agave-install
+          # make sure cargo‐installed binaries are on PATH
+          source "$HOME/.cargo/env"
+      - name: Install Solana CLI via agave-install
+        env:
+          SOLANA_VERSION: "1.18.15"
         run: |
-          sudo apt-get update
-          sudo apt-get install -y pkg-config libssl-dev ca-certificates
-
-      # Install AVM (Anchor Version Manager) via cargo
+          # this command will vary depending on how agave-install expects args:
+          agave-install solana-cli "${SOLANA_VERSION}"  
+          # now add the Solana bin dir to the PATH for later steps
+          echo "$HOME/.agave/bin" >> $GITHUB_PATH
       - name: Install AVM
         run: |
           cargo install --locked avm
           source "$HOME/.cargo/env"
-
-      # Use AVM to install the Anchor CLI
-      - name: Install Anchor CLI via AVM
+      - name: Install Anchor via AVM
         env:
           ANCHOR_VERSION: "0.30.1"
         run: |
           avm install "${ANCHOR_VERSION}" --force
           avm use "${ANCHOR_VERSION}"
           anchor --version
-
-      - name: make check-idl
+      - name: Install solana-cli
+        run: |
+          cargo install solana-cli
+      - name: Set default Rust toolchain
+        run: rustup default stable
         working-directory: ./solana
+      - name: make check-idl
         run: make check-idl
+        working-directory: ./solana
 
   make-anchor-test:
     name: make anchor-test