Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 2f3a6bb

Browse files
committed
Merge branch 'master' into confidential_mint_burn_ext
2 parents ac1d380 + 1253bf0 commit 2f3a6bb

File tree

286 files changed

+7365
-3741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+7365
-3741
lines changed

.github/workflows/publish-rust.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
steps:
6161
- uses: actions/checkout@v4
6262

63+
- name: Remove unneeded packages for more space
64+
run: bash ./ci/warning/purge-ubuntu-runner.sh
65+
6366
- name: Set env vars
6467
run: |
6568
source ci/rust-version.sh

.github/workflows/pull-request-account-compression.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ jobs:
3232

3333
- name: Set env vars
3434
run: |
35+
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
36+
echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
3537
source ci/rust-version.sh
3638
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
3739
source ci/solana-version.sh
38-
echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
3940
source ci/install-anchor.sh
4041
echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV
4142
@@ -80,7 +81,7 @@ jobs:
8081
js-test-account-compression:
8182
runs-on: ubuntu-latest
8283
env:
83-
NODE_VERSION: 20.5
84+
NODE_VERSION: 20.X
8485
steps:
8586
- uses: actions/checkout@v4
8687
- name: Use Node.js ${{ env.NODE_VERSION }}
@@ -94,4 +95,6 @@ jobs:
9495
key: node-${{ hashFiles('pnpm-lock.yaml') }}
9596
restore-keys: |
9697
node-
98+
- name: Set env vars
99+
run: echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
97100
- run: ./ci/js-test-account-compression.sh

.github/workflows/pull-request-js.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
node-version: [16.x, 18.x, 20.x]
4444
package:
4545
[
46-
account-compression,
4746
memo,
4847
name-service,
4948
stake-pool,
@@ -52,6 +51,8 @@ jobs:
5251
]
5352
include:
5453
# Restrict certain packages to supported Node.js versions.
54+
- package: account-compression
55+
node-version: 20.x
5556
- package: libraries
5657
node-version: 20.x
5758
- package: single-pool

.github/workflows/pull-request-token.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,14 @@ jobs:
205205

206206
- name: Set env vars
207207
run: |
208-
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
209208
source ci/rust-version.sh
210209
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
211210
source ci/solana-version.sh
212211
echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
213212
214213
- uses: dtolnay/rust-toolchain@master
215214
with:
216-
toolchain: ${{ env.RUST_STABLE_VERSION }}
215+
toolchain: ${{ env.RUST_STABLE }}
217216

218217
- uses: actions/cache@v4
219218
with:

.github/workflows/pull-request.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949

50+
- name: Remove unneeded packages for more space
51+
run: bash ./ci/warning/purge-ubuntu-runner.sh
52+
5053
- name: Set env vars
5154
run: |
5255
source ci/rust-version.sh

Anchor.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[toolchain]
22
anchor_version = "0.29.0"
3-
solana_version = "2.0.3"
3+
solana_version = "2.1.0"
44

55
[workspace]
66
members = [

0 commit comments

Comments
 (0)