Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/actions/setup-anchor/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
name: "Setup anchor-cli"
description: "Setup node js and anchor cli"
description: "Setup bun and anchor cli"
runs:
using: "composite"
steps:
- uses: actions/setup-node@v6
- uses: oven-sh/setup-bun@v2
- uses: actions/cache@v4
id: cache-anchor-cli
with:
node-version: ${{ env.NODE_VERSION }}
- run: cargo install --git https://github.com/coral-xyz/anchor --tag v${{ env.ANCHOR_CLI_VERSION }} anchor-cli --locked
path: ~/.cargo/bin/anchor
key: anchor-cli-${{ runner.os }}-${{ env.ANCHOR_CLI_VERSION }}
- if: steps.cache-anchor-cli.outputs.cache-hit != 'true'
run: cargo install --git https://github.com/coral-xyz/anchor --tag v${{ env.ANCHOR_CLI_VERSION }} anchor-cli --locked
shell: bash
22 changes: 9 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ on:
- release_*

env:
SOLANA_CLI_VERSION: 2.3.13
NODE_VERSION: 22.15.0
ANCHOR_CLI_VERSION: 0.31.1
TOOLCHAIN: 1.85.0
SOLANA_CLI_VERSION: 3.1.10
ANCHOR_CLI_VERSION: 1.0.2
TOOLCHAIN: 1.93.0

jobs:
program_changed_files:
Expand All @@ -27,7 +26,6 @@ jobs:
with:
files: |
programs/zap
protocol-zap
zap-sdk

anchor_build:
Expand All @@ -50,7 +48,7 @@ jobs:
with:
path: ~/.anchor
key: anchor-${{ runner.os }}-${{ hashFiles('Anchor.toml') }}
- run: anchor build
- run: anchor build --ignore-keys
shell: bash

unit_test:
Expand All @@ -68,8 +66,6 @@ jobs:
- uses: Swatinem/rust-cache@v2
- run: cargo test --package zap
shell: bash
- run: cargo test --package protocol-zap
shell: bash

integration_test:
runs-on: ubuntu-latest
Expand All @@ -82,8 +78,8 @@ jobs:
- uses: ./.github/actions/setup-solana
- uses: ./.github/actions/setup-dep
- uses: ./.github/actions/setup-anchor
# Install pnpm
- uses: pnpm/action-setup@v4 # docs https://pnpm.io/continuous-integration#github-actions
# Install bun
- uses: oven-sh/setup-bun@v2
# Install rust + toolchain
- uses: dtolnay/rust-toolchain@stable
with:
Expand All @@ -96,9 +92,9 @@ jobs:
id: cache-node-modules
with:
path: ./node_modules
key: ${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
key: ${{ runner.os }}-${{ hashFiles('./bun.lock') }}
# Testing
- run: pnpm install
- run: bun install
shell: bash
- run: pnpm test
- run: bun run build-local-test
shell: bash
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ target
node_modules
test-ledger
.yarn
deploy.sh
deploy.sh

.notes
CLAUDE.md
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
9 changes: 4 additions & 5 deletions Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[toolchain]
anchor_version = "0.31.1"
solana_version = "2.3.13"
package_manager = "pnpm"
anchor_version = "1.0.2"
solana_version = "3.1.10"
package_manager = "bun"

[features]
resolution = true
Expand All @@ -17,5 +17,4 @@ url = "https://api.apr.dev"
cluster = "localnet"
wallet = "~/.config/solana/id.json"

[scripts]
test = "pnpm ts-mocha --no-experimental-strip-types -p ./tsconfig.json -t 1000000 tests/**/*.ts"
[hooks]
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Breaking Changes

## zap [0.2.3] [PR #53](https://github.com/MeteoraAg/zap-program/pull/53)

### Changed

- Update anchor to `1.0.2`

## zap [0.2.2] [PR #46](https://github.com/MeteoraAg/zap-program/pull/46)

### Added
Expand Down
Loading
Loading