Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into confidential_mint_burn_ext
Browse files Browse the repository at this point in the history
  • Loading branch information
abcalphabet committed Dec 9, 2024
2 parents ac1d380 + 1253bf0 commit 2f3a6bb
Show file tree
Hide file tree
Showing 286 changed files with 7,365 additions and 3,741 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/publish-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Remove unneeded packages for more space
run: bash ./ci/warning/purge-ubuntu-runner.sh

- name: Set env vars
run: |
source ci/rust-version.sh
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/pull-request-account-compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ jobs:

- name: Set env vars
run: |
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
source ci/rust-version.sh
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
source ci/solana-version.sh
echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
source ci/install-anchor.sh
echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV
Expand Down Expand Up @@ -80,7 +81,7 @@ jobs:
js-test-account-compression:
runs-on: ubuntu-latest
env:
NODE_VERSION: 20.5
NODE_VERSION: 20.X
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ env.NODE_VERSION }}
Expand All @@ -94,4 +95,6 @@ jobs:
key: node-${{ hashFiles('pnpm-lock.yaml') }}
restore-keys: |
node-
- name: Set env vars
run: echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
- run: ./ci/js-test-account-compression.sh
3 changes: 2 additions & 1 deletion .github/workflows/pull-request-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
node-version: [16.x, 18.x, 20.x]
package:
[
account-compression,
memo,
name-service,
stake-pool,
Expand All @@ -52,6 +51,8 @@ jobs:
]
include:
# Restrict certain packages to supported Node.js versions.
- package: account-compression
node-version: 20.x
- package: libraries
node-version: 20.x
- package: single-pool
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pull-request-token.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,14 @@ jobs:

- name: Set env vars
run: |
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
source ci/rust-version.sh
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
source ci/solana-version.sh
echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_STABLE_VERSION }}
toolchain: ${{ env.RUST_STABLE }}

- uses: actions/cache@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Remove unneeded packages for more space
run: bash ./ci/warning/purge-ubuntu-runner.sh

- name: Set env vars
run: |
source ci/rust-version.sh
Expand Down
2 changes: 1 addition & 1 deletion Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
anchor_version = "0.29.0"
solana_version = "2.0.3"
solana_version = "2.1.0"

[workspace]
members = [
Expand Down
Loading

0 comments on commit 2f3a6bb

Please sign in to comment.