Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit d18a87d

Browse files
joncinquejoncinque
committed
Add --force-tools-install to command
1 parent 27fdb8e commit d18a87d

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

‎.github/workflows/pull-request-single-pool.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
106106
- name: Build dependent programs
107107
run: |
108-
cargo build-sbf --tools-version v1.43 --manifest-path=single-pool/program/Cargo.toml
108+
cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path=single-pool/program/Cargo.toml
109109
110110
- name: Build and test
111111
run: |

‎.github/workflows/pull-request-token-swap.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
- name: Build production version
7171
run: |
72-
cargo +"$RUST_STABLE" build-sbf --tools-version v1.43 \
72+
cargo +"$RUST_STABLE" build-sbf --tools-version v1.43 --force-tools-install \
7373
--manifest-path=token-swap/program/Cargo.toml \
7474
--features production \
7575
--sbf-out-dir target/deploy-production

‎.github/workflows/pull-request-token-upgrade.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
102102
- name: Build dependent programs
103103
run: |
104-
cargo build-sbf --tools-version v1.43 --manifest-path ./token-upgrade/program/Cargo.toml
104+
cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path ./token-upgrade/program/Cargo.toml
105105
106106
- name: Run CLI tests
107107
run: |

‎.github/workflows/pull-request-token.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205

206206
- name: Set env vars
207207
run: |
208-
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
208+
echo "RUST_STABLE_VERSION=1.81.0" >> $GITHUB_ENV
209209
source ci/rust-version.sh
210210
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
211211
source ci/solana-version.sh
@@ -230,8 +230,8 @@ jobs:
230230
231231
- name: Build and test token-2022
232232
run: |
233-
cargo build-sbf --tools-version v1.43 --manifest-path token/program-2022/Cargo.toml
234-
cargo build-sbf --tools-version v1.43 --manifest-path instruction-padding/program/Cargo.toml
233+
cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path token/program-2022/Cargo.toml
234+
cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path instruction-padding/program/Cargo.toml
235235
./ci/cargo-test-sbf.sh token/program-2022-test
236236
237237
js-test:

‎account-compression/sdk/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"scripts": {
3636
"build": "rm -rf dist/ && tsc -p tsconfig.json",
37-
"build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../programs/account-compression/Cargo.toml && cargo build-sbf --manifest-path=../programs/noop/Cargo.toml",
37+
"build:program": "cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path=../programs/account-compression/Cargo.toml && cargo build-sbf --manifest-path=../programs/noop/Cargo.toml",
3838
"lint": "set -ex; eslint . --ext .js,.ts",
3939
"lint:fix": "eslint . --fix --ext .js,.ts",
4040
"docs": "rm -rf docs/ && typedoc --out docs",

‎ci/cargo-test-sbf.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [[ -r $run_dir/Cargo.toml ]]; then
3232
set -x
3333
cd $run_dir
3434
# Remove tools version specification once v2.1 cargo-build-sbf is available
35-
cargo +"$rust_stable" test-sbf --tools-version v1.43 -- --nocapture
35+
cargo +"$rust_stable" test-sbf --tools-version v1.43 --force-tools-install -- --nocapture
3636
exit 0
3737
fi
3838

@@ -45,7 +45,7 @@ for program in $run_dir/program{,-*}; do
4545
set -x
4646
cd $program
4747
# Remove tools version specification once v2.1 cargo-build-sbf is available
48-
cargo +"$rust_stable" test-sbf --tools-version v1.43 -- --nocapture
48+
cargo +"$rust_stable" test-sbf --tools-version v1.43 --force-tools-install -- --nocapture
4949
)
5050
fi
5151
done
@@ -56,6 +56,6 @@ if [[ -n $run_all ]]; then
5656
for directory in $(ls -d $run_dir/*/); do
5757
cd $directory
5858
# Remove tools version specification once v2.1 cargo-build-sbf is available
59-
cargo +"$rust_stable" test-sbf --tools-version v1.43 -- --nocapture
59+
cargo +"$rust_stable" test-sbf --tools-version v1.43 --force-tools-install -- --nocapture
6060
done
6161
fi

‎name-service/js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"scripts": {
3434
"build": "tsc --build --verbose tsconfig.all.json",
35-
"build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../program/Cargo.toml",
35+
"build:program": "cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path=../program/Cargo.toml",
3636
"prepublish": "tsc",
3737
"lint": "eslint --max-warnings 0 'src/*.ts'",
3838
"lint:fix": "eslint 'src/*.ts' --fix",

‎single-pool/js/packages/classic/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"scripts": {
1313
"clean": "rm -rf dist/*",
1414
"build": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && ./ts-fixup.sh",
15-
"build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../../../program/Cargo.toml",
15+
"build:program": "cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path=../../../program/Cargo.toml",
1616
"lint": "eslint --max-warnings 0 .",
1717
"lint:fix": "eslint . --fix",
1818
"test": "sed -i '1s/.*/{ \"type\": \"module\",/' package.json && NODE_OPTIONS='--loader=tsx' ava ; ret=$?; sed -i '1s/.*/{/' package.json && exit $ret"

‎stake-pool/js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "SPL Stake Pool Program JS API",
55
"scripts": {
66
"build": "tsc && cross-env NODE_ENV=production rollup -c",
7-
"build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../program/Cargo.toml",
7+
"build:program": "cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path=../program/Cargo.toml",
88
"lint": "eslint --max-warnings 0 .",
99
"lint:fix": "eslint . --fix",
1010
"test": "jest",

‎token-swap/js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"clean": "rm -rf lib/*",
3535
"build": "tsc --build --verbose tsconfig.all.json",
3636
"postbuild": "echo '{\"type\":\"commonjs\"}' > lib/cjs/package.json && echo '{\"type\":\"module\"}' > lib/esm/package.json",
37-
"build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../program/Cargo.toml",
37+
"build:program": "cargo build-sbf --tools-version v1.43 --force-tools-install --manifest-path=../program/Cargo.toml",
3838
"test:js": "mocha test",
3939
"test": "start-server-and-test 'solana-test-validator --bpf-program SwapsVeCiPHMUAtzQWZw7RjsKjgCjhwU55QGu4U1Szw ../../target/deploy/spl_token_swap.so --reset --quiet' http://127.0.0.1:8899/health test:js",
4040
"lint": "eslint --max-warnings 0 .",

0 commit comments

Comments
 (0)