Browse Source

update anchor ts dep paths (#1778)

Paul 3 years ago
parent
commit
b665f28b16

+ 2 - 2
.github/workflows/no-cashing-tests.yaml

@@ -161,7 +161,7 @@ jobs:
       - run: solana-test-validator -r --quiet &
       - run: solana-test-validator -r --quiet &
         name: start validator
         name: start validator
       - run: cd tests/bpf-upgradeable-state && yarn --frozen-lockfile
       - 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 && 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 && 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
       - 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: chmod +x ~/.cargo/bin/anchor
       
       
       - run: cd tests/misc && yarn --frozen-lockfile
       - 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 && chmod +x ci.sh && ./ci.sh
       - run: cd tests/misc && anchor test --skip-lint
       - run: cd tests/misc && anchor test --skip-lint
 
 

+ 2 - 2
.github/workflows/tests.yaml

@@ -241,7 +241,7 @@ jobs:
       - run: solana-test-validator -r --quiet &
       - run: solana-test-validator -r --quiet &
         name: start validator
         name: start validator
       - run: cd tests/bpf-upgradeable-state && yarn --frozen-lockfile
       - 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 && 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 && 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
       - 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') }}
           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 --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 && chmod +x ci.sh && ./ci.sh
       - run: cd tests/misc && anchor test --skip-lint
       - run: cd tests/misc && anchor test --skip-lint
 
 

+ 1 - 1
examples/tutorial/package.json

@@ -13,7 +13,7 @@
     "basic-4"
     "basic-4"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@project-serum/anchor": "^0.24.0"
+    "@project-serum/anchor": "file:../../ts"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "mocha": "^9.1.3",
     "mocha": "^9.1.3",

+ 1 - 3
examples/tutorial/yarn.lock

@@ -30,10 +30,8 @@
     "@ethersproject/logger" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
     hash.js "1.1.7"
     hash.js "1.1.7"
 
 
-"@project-serum/anchor@^0.24.0":
+"@project-serum/anchor@file:../../ts":
   version "0.24.0"
   version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.0.tgz#ec8a45847f6b54f56ab97552cf5735beded3b39e"
-  integrity sha512-kDCpDMmXAEyhjExv0A5voEJN6eiKtCChu4egidk8ljdsxp0c29YWjSkx3zjOrMUK0YH1cz0qnsxuT1nCCtUgUQ==
   dependencies:
   dependencies:
     "@project-serum/borsh" "^0.2.5"
     "@project-serum/borsh" "^0.2.5"
     "@solana/web3.js" "^1.36.0"
     "@solana/web3.js" "^1.36.0"

+ 1 - 1
tests/package.json

@@ -36,7 +36,7 @@
     "multiple-suites"
     "multiple-suites"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@project-serum/anchor": "^0.24.0",
+    "@project-serum/anchor": "file:../ts",
     "@project-serum/common": "^0.0.1-beta.3",
     "@project-serum/common": "^0.0.1-beta.3",
     "@project-serum/serum": "^0.13.60",
     "@project-serum/serum": "^0.13.60",
     "@solana/spl-token": "^0.1.8"
     "@solana/spl-token": "^0.1.8"

+ 1 - 3
tests/yarn.lock

@@ -50,10 +50,8 @@
     snake-case "^3.0.4"
     snake-case "^3.0.4"
     toml "^3.0.0"
     toml "^3.0.0"
 
 
-"@project-serum/anchor@^0.24.0":
+"@project-serum/anchor@file:../ts":
   version "0.24.0"
   version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.0.tgz#ec8a45847f6b54f56ab97552cf5735beded3b39e"
-  integrity sha512-kDCpDMmXAEyhjExv0A5voEJN6eiKtCChu4egidk8ljdsxp0c29YWjSkx3zjOrMUK0YH1cz0qnsxuT1nCCtUgUQ==
   dependencies:
   dependencies:
     "@project-serum/borsh" "^0.2.5"
     "@project-serum/borsh" "^0.2.5"
     "@solana/web3.js" "^1.36.0"
     "@solana/web3.js" "^1.36.0"