Loris Leiva пре 1 година
родитељ
комит
1ade9f890a
4 измењених фајлова са 16 додато и 5 уклоњено
  1. 1 1
      .github/actions/setup/action.yml
  2. 8 1
      clients/js/package.json
  3. 4 1
      package.json
  4. 3 2
      scripts/client/test-rust.mjs

+ 1 - 1
.github/actions/setup/action.yml

@@ -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

+ 8 - 1
clients/js/package.json

@@ -33,6 +33,14 @@
     "registry": "https://registry.npmjs.org"
   },
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/solana-program/system.git"
+  },
+  "bugs": {
+    "url": "https://github.com/solana-program/system/issues"
+  },
+  "homepage": "https://github.com/solana-program/system#readme",
   "peerDependencies": {
     "@solana/web3.js": "2.0.0-rc.1"
   },
@@ -49,7 +57,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": {

+ 4 - 1
package.json

@@ -19,12 +19,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": "pnpm@9.1.0"
 }

+ 3 - 2
scripts/client/test-rust.mjs

@@ -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}`;
 }