fix: ci

Author: ananas-block

.github/workflows/lint.yml

@@ -39,23 +39,5 @@ jobs:
             ${{ runner.os }}-cargo-lint-
             ${{ runner.os }}-cargo-
 
-      - name: Check formatting
-        run: cargo fmt --all --check
-
-      - name: Run clippy
-        run: cargo clippy --all-targets --all-features -- -D warnings
-
-      - name: Run clippy (create-and-update)
-        run: cargo clippy --manifest-path create-and-update/Cargo.toml --all-targets --all-features -- -D warnings
-
-      - name: Run clippy (counter/anchor)
-        run: cargo clippy --manifest-path counter/anchor/Cargo.toml --all-targets --all-features -- -D warnings
-
-      - name: Run clippy (counter/native) 
-        run: cargo clippy --manifest-path counter/native/Cargo.toml --all-targets --all-features -- -D warnings
-
-      - name: Run clippy (counter/pinocchio)
-        run: cargo clippy --manifest-path counter/pinocchio/Cargo.toml --all-targets --all-features -- -D warnings
-
-      - name: Run clippy (account-comparison)
-        run: cargo clippy --manifest-path account-comparison/Cargo.toml --all-targets --all-features -- -D warnings
+      - name: Run lint script
+        run: ./scripts/lint.sh

.github/workflows/program-tests.yml

@@ -54,7 +54,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "23.5.0"
-          cache: "npm"
 
       - name: Cache Rust dependencies
         uses: actions/cache@v4
@@ -76,8 +75,13 @@ jobs:
 
       - name: Install Solana CLI
         run: |
-          sh -c "$(curl -sSfL https://release.solana.com/v2.2.15/install)"
-          echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
+          # Install via cargo for better CI reliability
+          cargo install solana-cli --version 2.2.15
+          # Verify installation
+          ~/.cargo/bin/solana --version
+          ~/.cargo/bin/solana-keygen --version
+          # Add to PATH for subsequent steps
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Install Anchor CLI
         run: |
@@ -95,11 +99,11 @@ jobs:
 
       - name: Start Light test validator
         run: |
-          light test-validator &
-          sleep 30
+          light test-validator
 
       - name: Run tests
         run: |
+          export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
           SUB_TESTS='${{ matrix.sub-tests }}'
           for test in $(echo $SUB_TESTS | jq -r '.[]'); do
             echo "Running: $test"

scripts/lint.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -e
+
+echo "Checking formatting..."
+
+# Check formatting for each crate
+echo "Checking create-and-update..."
+cd create-and-update && cargo fmt --check && cd ..
+
+echo "Checking counter/anchor..."
+cd counter/anchor && cargo fmt --check && cd ../..
+
+echo "Checking counter/native..."
+cd counter/native && cargo fmt --check && cd ../..
+
+echo "Checking counter/pinocchio..."
+cd counter/pinocchio && cargo fmt --check && cd ../..
+
+echo "Checking account-comparison..."
+cd account-comparison && cargo fmt --check && cd ..
+
+echo "Running clippy..."
+
+# Run clippy for each crate
+echo "Running clippy on create-and-update..."
+cargo clippy --manifest-path create-and-update/Cargo.toml --all-targets --all-features -- -D warnings
+
+echo "Running clippy on counter/anchor..."
+cargo clippy --manifest-path counter/anchor/Cargo.toml --all-targets --all-features -- -D warnings
+
+echo "Running clippy on counter/native..."
+cargo clippy --manifest-path counter/native/Cargo.toml --all-targets --all-features -- -D warnings
+
+echo "Running clippy on counter/pinocchio..."
+cargo clippy --manifest-path counter/pinocchio/Cargo.toml --all-targets --all-features -- -D warnings
+
+echo "Running clippy on account-comparison..."
+cargo clippy --manifest-path account-comparison/Cargo.toml --all-targets --all-features -- -D warnings
+
+echo "Lint checks completed successfully!"