From b665f28b16f4a183ad3bd48752210321700d50fa Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 12 Apr 2022 18:16:04 -0400 Subject: [PATCH] update anchor ts dep paths (#1778) --- .github/workflows/no-cashing-tests.yaml | 4 ++-- .github/workflows/tests.yaml | 4 ++-- examples/tutorial/package.json | 2 +- examples/tutorial/yarn.lock | 4 +--- tests/package.json | 2 +- tests/yarn.lock | 4 +--- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/no-cashing-tests.yaml b/.github/workflows/no-cashing-tests.yaml index 2e11e56546..605fe2bdf4 100644 --- a/.github/workflows/no-cashing-tests.yaml +++ b/.github/workflows/no-cashing-tests.yaml @@ -161,7 +161,7 @@ jobs: - run: solana-test-validator -r --quiet & name: start validator - run: cd tests/bpf-upgradeable-state && yarn --frozen-lockfile - - run: cd tests/bpf-upgradeable-state && yarn link @project-serum/anchor + - run: cd tests/bpf-upgradeable-state - run: cd tests/bpf-upgradeable-state && anchor build --skip-lint - run: cd tests/bpf-upgradeable-state && solana program deploy --program-id program_with_different_programdata.json target/deploy/bpf_upgradeable_state.so - run: cd tests/bpf-upgradeable-state && cp bpf_upgradeable_state-keypair.json target/deploy/bpf_upgradeable_state-keypair.json && anchor test --skip-local-validator --skip-build --skip-lint @@ -199,7 +199,7 @@ jobs: - run: chmod +x ~/.cargo/bin/anchor - run: cd tests/misc && yarn --frozen-lockfile - - run: cd tests/misc && yarn link @project-serum/anchor + - run: cd tests/misc - run: cd tests/misc && chmod +x ci.sh && ./ci.sh - run: cd tests/misc && anchor test --skip-lint diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 81f6f03679..3c38a17ff6 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -241,7 +241,7 @@ jobs: - run: solana-test-validator -r --quiet & name: start validator - run: cd tests/bpf-upgradeable-state && yarn --frozen-lockfile - - run: cd tests/bpf-upgradeable-state && yarn link @project-serum/anchor + - run: cd tests/bpf-upgradeable-state - run: cd tests/bpf-upgradeable-state && anchor build --skip-lint - run: cd tests/bpf-upgradeable-state && solana program deploy --program-id program_with_different_programdata.json target/deploy/bpf_upgradeable_state.so - run: cd tests/bpf-upgradeable-state && cp bpf_upgradeable_state-keypair.json target/deploy/bpf_upgradeable_state-keypair.json && anchor test --skip-local-validator --skip-build --skip-lint @@ -294,7 +294,7 @@ jobs: key: cargo-${{ runner.os }}-tests/misc-${{ env.ANCHOR_VERSION }}-1.8.14-${{ hashFiles('**/Cargo.lock') }} - run: cd tests/misc && yarn --frozen-lockfile - - run: cd tests/misc && yarn link @project-serum/anchor + - run: cd tests/misc - run: cd tests/misc && chmod +x ci.sh && ./ci.sh - run: cd tests/misc && anchor test --skip-lint diff --git a/examples/tutorial/package.json b/examples/tutorial/package.json index af70ba3b8d..6760dfaf5e 100644 --- a/examples/tutorial/package.json +++ b/examples/tutorial/package.json @@ -13,7 +13,7 @@ "basic-4" ], "dependencies": { - "@project-serum/anchor": "^0.24.0" + "@project-serum/anchor": "file:../../ts" }, "devDependencies": { "mocha": "^9.1.3", diff --git a/examples/tutorial/yarn.lock b/examples/tutorial/yarn.lock index ceeac40e2e..478e9d9565 100644 --- a/examples/tutorial/yarn.lock +++ b/examples/tutorial/yarn.lock @@ -30,10 +30,8 @@ "@ethersproject/logger" "^5.5.0" hash.js "1.1.7" -"@project-serum/anchor@^0.24.0": +"@project-serum/anchor@file:../../ts": version "0.24.0" - resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.0.tgz#ec8a45847f6b54f56ab97552cf5735beded3b39e" - integrity sha512-kDCpDMmXAEyhjExv0A5voEJN6eiKtCChu4egidk8ljdsxp0c29YWjSkx3zjOrMUK0YH1cz0qnsxuT1nCCtUgUQ== dependencies: "@project-serum/borsh" "^0.2.5" "@solana/web3.js" "^1.36.0" diff --git a/tests/package.json b/tests/package.json index d398c90979..a55fcef4a8 100644 --- a/tests/package.json +++ b/tests/package.json @@ -36,7 +36,7 @@ "multiple-suites" ], "dependencies": { - "@project-serum/anchor": "^0.24.0", + "@project-serum/anchor": "file:../ts", "@project-serum/common": "^0.0.1-beta.3", "@project-serum/serum": "^0.13.60", "@solana/spl-token": "^0.1.8" diff --git a/tests/yarn.lock b/tests/yarn.lock index e7ab670ac3..8e1bd756ba 100644 --- a/tests/yarn.lock +++ b/tests/yarn.lock @@ -50,10 +50,8 @@ snake-case "^3.0.4" toml "^3.0.0" -"@project-serum/anchor@^0.24.0": +"@project-serum/anchor@file:../ts": version "0.24.0" - resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.0.tgz#ec8a45847f6b54f56ab97552cf5735beded3b39e" - integrity sha512-kDCpDMmXAEyhjExv0A5voEJN6eiKtCChu4egidk8ljdsxp0c29YWjSkx3zjOrMUK0YH1cz0qnsxuT1nCCtUgUQ== dependencies: "@project-serum/borsh" "^0.2.5" "@solana/web3.js" "^1.36.0"