Fix twoxtx setup vis-a-vis workspace inheritance (#4063)

This commit is contained in:
Tyera 2023-02-26 21:31:08 -07:00 committed by GitHub
parent 1caeadd65d
commit 9b5e63c39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View File

@ -114,7 +114,9 @@ jobs:
- name: Build and test token-2022 twoxtx (TEMPORARY)
run: |
./token/twoxtx-setup.sh
cargo +${{ env.RUST_STABLE_VERSION }} test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
./token/twoxtx-solana/cargo-build-sbf --manifest-path token/program-2022/Cargo.toml
./token/twoxtx-solana/cargo-build-sbf --manifest-path instruction-padding/program/Cargo.toml
./token/twoxtx-solana/cargo-test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
js-test:
runs-on: ubuntu-latest

View File

@ -25,4 +25,11 @@ if [[ ! -f twoxtx-solana/.twoxtx-patched ]]; then
fi
../patch.crates-io.sh twoxtx-solana
repo="token/twoxtx-solana"
if sed -n '/exclude = \[/,/\]/p' ../Cargo.toml | grep -q "$repo"; then
echo "$repo is already excluded"
else
sed -i'' ../Cargo.toml -e "/exclude/a \ \ \"$repo\","
fi
exit 0