Skip to content

Commit

Permalink
fix: test ci with pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
00xSam committed Dec 3, 2024
1 parent d11c32e commit 00e788e
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci_ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,8 @@ jobs:
# This much more faster than anchor localnet
- run: solana-test-validator --bpf-program 24Uqj9JCLxUeoC3hGfh5W3s9FM9uCHDS2SG3LYwBpyTi ./dynamic-amm-quote/tests/fixtures/dynamic_vault.so --bpf-program Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB ./dynamic-amm-quote/tests/fixtures/dynamic_amm.so --bpf-program metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s ./dynamic-amm-quote/tests/fixtures/metaplex.so --account-dir ./dynamic-amm-quote/tests/fixtures/accounts --reset & sleep 2
shell: bash
- run: cd ts-client && npm install && npm run test
- uses: pnpm/action-setup@v4
with:
version: 9
- run: pnpm i -D concurrently && cd ts-client && pnpm run postclone && pnpm install && pnpm run test
shell: bash
7 changes: 4 additions & 3 deletions ts-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
"scripts": {
"postclone": "pnpm rm @meteora-ag/vault-sdk && pnpm install @meteora-ag/vault-sdk",
"postclone": "npx concurrently 'pnpm rm @meteora-ag/vault-sdk && pnpm rm @meteora-ag/config' 'pnpm install @meteora-ag/vault-sdk && pnpm install @meteora-ag/config'",
"build": "rm -rf dist && tsc -p tsconfig.build.json && tsc -p tsconfig.esm.json",
"test": "jest ./src/amm/tests/*.test.ts --runInBand"
},
Expand All @@ -17,8 +17,8 @@
"@mercurial-finance/token-math": "6.0.0",
"@metaplex-foundation/mpl-token-metadata": "~2.13.0",
"@meteora-ag/config": "workspace:*",
"@meteora-ag/vault-sdk": "workspace:*",
"@meteora-ag/stake-for-fee": "1.0.28",
"@meteora-ag/vault-sdk": "workspace:*",
"@solana/buffer-layout": "^4.0.1",
"bn-sqrt": "^1.0.0",
"bn.js": "5.2.1",
Expand All @@ -34,15 +34,16 @@
"@types/jest": "^27.5.1",
"@types/mocha": "^9.1.1",
"chai": "^4.3.6",
"concurrently": "^9.1.0",
"jest": "^28.1.0",
"mocha": "^10.0.0",
"ts-jest": "^28.0.2",
"ts-mocha": "^10.0.0",
"typescript": "^5.5.4"
},
"peerDependencies": {
"@solana/buffer-layout": "^4.0.1",
"@coral-xyz/anchor": "^0.28.0",
"@solana/buffer-layout": "^4.0.1",
"@solana/spl-token": "^0.4.9",
"@solana/web3.js": "^1.95.5",
"bn.js": "^5.2.1"
Expand Down
56 changes: 56 additions & 0 deletions ts-client/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 00e788e

Please sign in to comment.