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

Commit 6d220a2

Browse files
authored
ci: Remove all references to twoxtx (#7234)
1 parent 58b08eb commit 6d220a2

File tree

5 files changed

+3
-174
lines changed

5 files changed

+3
-174
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
path: "target/deploy/*.so"
210210
if-no-files-found: error
211211

212-
cargo-test-sbf-twoxtx:
212+
cargo-test-sbf-token-2022:
213213
runs-on: ubuntu-latest
214214
steps:
215215
- uses: actions/checkout@v4
@@ -242,12 +242,11 @@ jobs:
242242
./ci/install-program-deps.sh
243243
echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
244244
245-
- name: Build and test token-2022 twoxtx (TEMPORARY)
245+
- name: Build and test token-2022
246246
run: |
247247
cargo build-sbf --manifest-path token/program-2022/Cargo.toml
248248
cargo build-sbf --manifest-path instruction-padding/program/Cargo.toml
249-
./token/twoxtx-setup.sh
250-
./token/twoxtx-solana/cargo-test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
249+
./ci/cargo-test-sbf.sh token/program-2022-test
251250
252251
js-test:
253252
runs-on: ubuntu-latest

token/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

token/program-2022-test/build.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,4 @@ fn main() {
6464
}
6565
}
6666
}
67-
68-
// Set the temporary `twoxtx` cfg if `../twoxtx-setup.sh` was run
69-
let twoxtx_solana_dir = cwd
70-
.parent()
71-
.expect("Unable to get parent directory of current working dir")
72-
.join("twoxtx-solana");
73-
if twoxtx_solana_dir.exists() {
74-
println!("cargo:rustc-cfg=twoxtx");
75-
}
7667
}

token/twoxtx-setup.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

token/twoxtx.patch

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)