Skip to content

Commit

Permalink
Update from template (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
lorisleiva authored Oct 24, 2024
1 parent 1cd0127 commit 94e95f5
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ runs:

- name: Install Solana
if: ${{ inputs.solana == 'true' }}
uses: metaplex-foundation/actions/install-solana@v1
uses: solana-program/actions/install-solana@v1
with:
version: ${{ env.SOLANA_VERSION }}
cache: true
Expand Down
9 changes: 8 additions & 1 deletion clients/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@
"registry": "https://registry.npmjs.org"
},
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "git+https://github.com/solana-program/token-2022.git"
},
"bugs": {
"url": "https://github.com/solana-program/token-2022/issues"
},
"homepage": "https://github.com/solana-program/token-2022#readme",
"peerDependencies": {
"@solana/web3.js": "2.0.0-rc.1"
},
Expand All @@ -50,7 +58,6 @@
"rimraf": "^5.0.5",
"tsup": "^8.1.2",
"typedoc": "^0.25.12",
"typedoc-plugin-missing-exports": "^2.2.0",
"typescript": "^5.5.3"
},
"ava": {
Expand Down
12 changes: 0 additions & 12 deletions clients/js/pnpm-lock.yaml

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

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@
"template:upgrade": "zx ./scripts/upgrade-template.mjs"
},
"devDependencies": {
"@iarna/toml": "^2.2.5",
"@codama/renderers-js": "^1.0.0",
"@codama/renderers-rust": "^1.0.0",
"@iarna/toml": "^2.2.5",
"codama": "^1.0.0",
"typescript": "^5.5.2",
"zx": "^7.2.3"
},
"engines": {
"node": ">=v20.0.0"
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion scripts/client/lint-rust.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
const lintArgs = cliArguments();

const fix = popArgument(lintArgs, '--fix');
const toolchain = getToolchainArgument('format');
const toolchain = getToolchainArgument('lint');
const manifestPath = path.join(
workingDirectory,
'clients',
Expand Down
5 changes: 3 additions & 2 deletions scripts/client/test-rust.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import { cliArguments, workingDirectory } from '../utils.mjs';
const testArgs = cliArguments();

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

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

0 comments on commit 94e95f5

Please sign in to comment.