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

Commit 9b5e63c

Browse files
author
Tyera
authored
Fix twoxtx setup vis-a-vis workspace inheritance (#4063)
1 parent 1caeadd commit 9b5e63c

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ jobs:
114114
- name: Build and test token-2022 twoxtx (TEMPORARY)
115115
run: |
116116
./token/twoxtx-setup.sh
117-
cargo +${{ env.RUST_STABLE_VERSION }} test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
117+
./token/twoxtx-solana/cargo-build-sbf --manifest-path token/program-2022/Cargo.toml
118+
./token/twoxtx-solana/cargo-build-sbf --manifest-path instruction-padding/program/Cargo.toml
119+
./token/twoxtx-solana/cargo-test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
118120
119121
js-test:
120122
runs-on: ubuntu-latest

token/twoxtx-setup.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,11 @@ if [[ ! -f twoxtx-solana/.twoxtx-patched ]]; then
2525
fi
2626

2727
../patch.crates-io.sh twoxtx-solana
28+
repo="token/twoxtx-solana"
29+
if sed -n '/exclude = \[/,/\]/p' ../Cargo.toml | grep -q "$repo"; then
30+
echo "$repo is already excluded"
31+
else
32+
sed -i'' ../Cargo.toml -e "/exclude/a \ \ \"$repo\","
33+
fi
34+
2835
exit 0

0 commit comments

Comments
 (0)