diff --git a/.github/workflows/solana.yml b/.github/workflows/solana.yml index 37107374..1226ffe5 100644 --- a/.github/workflows/solana.yml +++ b/.github/workflows/solana.yml @@ -10,9 +10,11 @@ on: - 'solana/**' env: + ANCHOR_VERSION: 0.30.1 CARGO_TERM_COLOR: always - RUSTC_VERSION: 1.75.0 - + NODE_VERSION: 20.11.0 + RUSTC_VERSION: 1.81.0 + SOLANA_VERSION: 1.18.15 jobs: cancel-previous-runs: runs-on: ubuntu-latest @@ -22,21 +24,35 @@ jobs: with: access_token: ${{ github.token }} - make-cargo-test-all: - name: make cargo-test-all - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Install toolchain - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ env.RUSTC_VERSION }} - - name: make cargo-test-all - run: make cargo-test-all - working-directory: ./solana + # make-cargo-test-all: + # name: make cargo-test-all + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: Install toolchain + # uses: dtolnay/rust-toolchain@master + # with: + # toolchain: ${{ env.RUSTC_VERSION }} + # - name: make cargo-test-all + # run: make cargo-test-all + # working-directory: ./solana - make-lint: - name: make lint + # make-lint: + # name: make lint + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: Install toolchain + # uses: dtolnay/rust-toolchain@master + # with: + # toolchain: ${{ env.RUSTC_VERSION }} + # components: clippy, rustfmt + # - name: make lint + # run: make lint + # working-directory: ./solana + + make-check-idl: + name: make check-idl runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -45,65 +61,60 @@ jobs: with: toolchain: ${{ env.RUSTC_VERSION }} components: clippy, rustfmt - - name: make lint - run: make lint - working-directory: ./solana - - make-check-idl: - name: make check-idl - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: metadaoproject/setup-anchor@v2 + - uses: actions/setup-node@v4 with: - node-version: "20.11.0" - solana-cli-version: "1.18.15" - anchor-version: "0.30.1" - - name: Set default Rust toolchain - run: rustup default stable + node-version: ${{ env.NODE_VERSION }} + - name: Install Solana CLI tools + run: sh -c "$(curl -sSfL https://release.anza.xyz/v${{ env.SOLANA_VERSION }}/install)" + shell: bash + - name: Update PATH + run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH + shell: bash + - name: wtf + run: cargo build-sbf -- --features integration-test working-directory: ./solana + - name: Install Anchor + run: npm i -g @coral-xyz/anchor-cli@${{ env.ANCHOR_VERSION }} + # with: + # node-version: "20.11.0" + # solana-cli-version: "1.18.15" + # anchor-version: "0.30.1" - name: make check-idl run: make check-idl working-directory: ./solana - make-anchor-test: - name: make anchor-test - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - with: - version: nightly - - uses: metadaoproject/setup-anchor@v2 - with: - node-version: "20.11.0" - solana-cli-version: "1.18.15" - anchor-version: "0.30.1" - - name: Set default Rust toolchain - run: rustup default stable - working-directory: ./solana - - name: make anchor-test - run: make anchor-test - working-directory: ./solana + # make-anchor-test: + # name: make anchor-test + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: Install Foundry + # uses: foundry-rs/foundry-toolchain@v1 + # with: + # version: nightly + # - uses: metadaoproject/setup-anchor@v2 + # with: + # node-version: "20.11.0" + # solana-cli-version: "1.18.15" + # anchor-version: "0.30.1" + # - name: make anchor-test + # run: make anchor-test + # working-directory: ./solana - make-anchor-test-upgrade: - name: make anchor-test-upgrade - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - with: - version: nightly - - uses: metadaoproject/setup-anchor@v2 - with: - node-version: "20.11.0" - solana-cli-version: "1.18.15" - anchor-version: "0.30.1" - - name: Set default Rust toolchain - run: rustup default stable - working-directory: ./solana - - name: make anchor-test-upgrade - run: make anchor-test-upgrade - working-directory: ./solana + # make-anchor-test-upgrade: + # name: make anchor-test-upgrade + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: Install Foundry + # uses: foundry-rs/foundry-toolchain@v1 + # with: + # version: nightly + # - uses: metadaoproject/setup-anchor@v2 + # with: + # node-version: "20.11.0" + # solana-cli-version: "1.18.15" + # anchor-version: "0.30.1" + # - name: make anchor-test-upgrade + # run: make anchor-test-upgrade + # working-directory: ./solana diff --git a/solana/removeme.txt b/solana/removeme.txt new file mode 100644 index 00000000..e69de29b