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

ci: Remove all references to twoxtx #7234

Merged
merged 1 commit into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/pull-request-token.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ jobs:
path: "target/deploy/*.so"
if-no-files-found: error

cargo-test-sbf-twoxtx:
cargo-test-sbf-token-2022:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -242,12 +242,11 @@ jobs:
./ci/install-program-deps.sh
echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH

- name: Build and test token-2022 twoxtx (TEMPORARY)
- name: Build and test token-2022
run: |
cargo build-sbf --manifest-path token/program-2022/Cargo.toml
cargo build-sbf --manifest-path instruction-padding/program/Cargo.toml
./token/twoxtx-setup.sh
./token/twoxtx-solana/cargo-test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
./ci/cargo-test-sbf.sh token/program-2022-test

js-test:
runs-on: ubuntu-latest
Expand Down
1 change: 0 additions & 1 deletion token/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions token/program-2022-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,4 @@ fn main() {
}
}
}

// Set the temporary `twoxtx` cfg if `../twoxtx-setup.sh` was run
let twoxtx_solana_dir = cwd
.parent()
.expect("Unable to get parent directory of current working dir")
.join("twoxtx-solana");
if twoxtx_solana_dir.exists() {
println!("cargo:rustc-cfg=twoxtx");
}
}
29 changes: 0 additions & 29 deletions token/twoxtx-setup.sh

This file was deleted.

131 changes: 0 additions & 131 deletions token/twoxtx.patch

This file was deleted.

Loading