Skip to content

Commit a32524c

Browse files
authored
Update from template (#9)
1 parent 12a2c97 commit a32524c

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

.github/actions/setup/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ runs:
5656

5757
- name: Install Solana
5858
if: ${{ inputs.solana == 'true' }}
59-
uses: metaplex-foundation/actions/install-solana@v1
59+
uses: solana-program/actions/install-solana@v1
6060
with:
6161
version: ${{ env.SOLANA_VERSION }}
6262
cache: true

clients/js/package.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
"registry": "https://registry.npmjs.org"
3434
},
3535
"license": "Apache-2.0",
36+
"repository": {
37+
"type": "git",
38+
"url": "git+https://github.com/solana-program/token.git"
39+
},
40+
"bugs": {
41+
"url": "https://github.com/solana-program/token/issues"
42+
},
43+
"homepage": "https://github.com/solana-program/token#readme",
3644
"peerDependencies": {
3745
"@solana/web3.js": "2.0.0-rc.1"
3846
},
@@ -50,7 +58,6 @@
5058
"rimraf": "^5.0.5",
5159
"tsup": "^8.1.2",
5260
"typedoc": "^0.25.12",
53-
"typedoc-plugin-missing-exports": "^2.2.0",
5461
"typescript": "^5.5.3"
5562
},
5663
"ava": {

clients/js/pnpm-lock.yaml

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@
1919
"template:upgrade": "zx ./scripts/upgrade-template.mjs"
2020
},
2121
"devDependencies": {
22-
"@iarna/toml": "^2.2.5",
2322
"@codama/renderers-js": "^1.0.0",
2423
"@codama/renderers-rust": "^1.0.0",
24+
"@iarna/toml": "^2.2.5",
2525
"codama": "^1.0.0",
2626
"typescript": "^5.5.2",
2727
"zx": "^7.2.3"
2828
},
29+
"engines": {
30+
"node": ">=v20.0.0"
31+
},
2932
"packageManager": "[email protected]"
3033
}

scripts/client/lint-rust.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
const lintArgs = cliArguments();
1313

1414
const fix = popArgument(lintArgs, '--fix');
15-
const toolchain = getToolchainArgument('format');
15+
const toolchain = getToolchainArgument('lint');
1616
const manifestPath = path.join(
1717
workingDirectory,
1818
'clients',

scripts/client/test-rust.mjs

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import { cliArguments, workingDirectory } from '../utils.mjs';
77
const testArgs = cliArguments();
88

99
const hasSolfmt = await which('solfmt', { nothrow: true });
10+
const sbfOutDir = path.join(workingDirectory, 'target', 'deploy');
1011

1112
// Run the tests.
1213
cd(path.join(workingDirectory, 'clients', 'rust'));
1314
if (hasSolfmt) {
14-
await $`cargo test-sbf ${testArgs} 2>&1 | solfmt`;
15+
await $`SBF_OUT_DIR=${sbfOutDir} cargo test --features "test-sbf" ${testArgs} 2>&1 | solfmt`;
1516
} else {
16-
await $`cargo test-sbf ${testArgs}`;
17+
await $`SBF_OUT_DIR=${sbfOutDir} cargo test --features "test-sbf" ${testArgs}`;
1718
}

0 commit comments

Comments
 (0)