From 568302036eda2d1f5b558b1f3277dd924590941f Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 21:37:41 +0900 Subject: [PATCH 1/8] Update Cargo.toml --- packages/contract/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/contract/Cargo.toml b/packages/contract/Cargo.toml index 158be60..7d57d07 100644 --- a/packages/contract/Cargo.toml +++ b/packages/contract/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "programs/*" ] From 628446d18e749182306935b2201097790efc3705 Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 21:43:21 +0900 Subject: [PATCH 2/8] Update Cargo.toml --- packages/contract/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/contract/Cargo.toml b/packages/contract/Cargo.toml index 7d57d07..0f7da92 100644 --- a/packages/contract/Cargo.toml +++ b/packages/contract/Cargo.toml @@ -4,6 +4,9 @@ members = [ "programs/*" ] +[toolchain] +anchor_version = "0.31.0" + [profile.release] overflow-checks = true lto = "fat" From 5a8faddbb8067679f241ad80f68b1d294b61b62b Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 21:49:40 +0900 Subject: [PATCH 3/8] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 439a435..216c0aa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -87,8 +87,8 @@ jobs: if: steps.cache-anchor.outputs.cache-hit != 'true' run: | cargo install --git https://github.com/coral-xyz/anchor avm --force - avm install latest - avm use latest + avm install 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 + avm use 0.31.0 working-directory: packages/contract - run: chmod +x ~/.cargo/bin/anchor From 8507032165e5f1bfcb58372b6b9e14ca6dc98999 Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 21:52:55 +0900 Subject: [PATCH 4/8] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 216c0aa..1027930 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Program tests on: [push, workflow_dispatch] env: - CACHE: true + CACHE: false NODE_VERSION: 23.7.0 SOLANA_CLI_VERSION: 2.2.6 ANCHOR_BINARY_NAME: anchor-binary-no-caching From 72474a7ddb4141dcfecb4b3f0cfa7b470de4e5b9 Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 22:10:14 +0900 Subject: [PATCH 5/8] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1027930..6240fb1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,7 +88,7 @@ jobs: run: | cargo install --git https://github.com/coral-xyz/anchor avm --force avm install 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 - avm use 0.31.0 + avm use 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 working-directory: packages/contract - run: chmod +x ~/.cargo/bin/anchor From ead50c7d18e62e9741d832423b9c6e262420744b Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 22:20:33 +0900 Subject: [PATCH 6/8] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6240fb1..a037f17 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -150,8 +150,8 @@ jobs: name: ${{ env.ANCHOR_BINARY_NAME }} path: ~/.cargo/bin/ - run: | - avm install latest - avm use latest + avm install 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 + avm use 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 chmod +x ~/.cargo/bin/anchor - name: Cache test target From 74259e29c0dba1730e9e1ec25bad94adcc6a041c Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 22:47:27 +0900 Subject: [PATCH 7/8] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a037f17..2eccab5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -150,6 +150,7 @@ jobs: name: ${{ env.ANCHOR_BINARY_NAME }} path: ~/.cargo/bin/ - run: | + cargo install --git https://github.com/coral-xyz/anchor avm --force avm install 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 avm use 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 chmod +x ~/.cargo/bin/anchor From 2e479cb77b0b95e7a2011bbd0d8cdd471d79510e Mon Sep 17 00:00:00 2001 From: neila <40727091+neila@users.noreply.github.com> Date: Mon, 21 Apr 2025 23:10:13 +0900 Subject: [PATCH 8/8] Update test.yml --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2eccab5..dd35693 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Program tests on: [push, workflow_dispatch] env: - CACHE: false + CACHE: true NODE_VERSION: 23.7.0 SOLANA_CLI_VERSION: 2.2.6 ANCHOR_BINARY_NAME: anchor-binary-no-caching @@ -150,7 +150,6 @@ jobs: name: ${{ env.ANCHOR_BINARY_NAME }} path: ~/.cargo/bin/ - run: | - cargo install --git https://github.com/coral-xyz/anchor avm --force avm install 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 avm use 0.31.0-0e5285aecdf410fa0779b7cd09a47f235882c156 chmod +x ~/.cargo/bin/anchor