From 73434226cff733523cf57c73b4444223c22a89d7 Mon Sep 17 00:00:00 2001 From: Jon C Date: Tue, 25 Jun 2024 00:31:32 +0200 Subject: [PATCH] Fixup twoxtx build --- .github/workflows/pull-request-token.yml | 2 +- patch.crates-io.sh | 2 +- token/twoxtx-setup.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index ed8c5e4a4c1..1f57da7f82b 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -219,7 +219,7 @@ jobs: - name: Set env vars run: | - echo "RUST_STABLE_VERSION=1.72.0" >> $GITHUB_ENV + echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV source ci/rust-version.sh echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV source ci/solana-version.sh diff --git a/patch.crates-io.sh b/patch.crates-io.sh index f3b99723dfe..986b63c91bd 100755 --- a/patch.crates-io.sh +++ b/patch.crates-io.sh @@ -67,7 +67,7 @@ crates_map+=("solana-entry entry") crates_map+=("solana-faucet faucet") crates_map+=("solana-frozen-abi frozen-abi") crates_map+=("solana-frozen-abi-macro frozen-abi/macro") -crates_map+=("solana-geyser-plugin-interface geyser-plugin-interface") +crates_map+=("agave-geyser-plugin-interface geyser-plugin-interface") crates_map+=("solana-geyser-plugin-manager geyser-plugin-manager") crates_map+=("solana-gossip gossip") crates_map+=("solana-ledger ledger") diff --git a/token/twoxtx-setup.sh b/token/twoxtx-setup.sh index 813971ab0be..d20f35d49fc 100755 --- a/token/twoxtx-setup.sh +++ b/token/twoxtx-setup.sh @@ -13,9 +13,9 @@ if [[ ! -d twoxtx-solana ]]; then if [[ -n $CI ]]; then git config --global user.email "you@example.com" git config --global user.name "Your Name" - git clone https://github.com/solana-labs/solana.git twoxtx-solana + git clone https://github.com/anza-xyz/agave.git twoxtx-solana else - git clone git@github.com:solana-labs/solana.git twoxtx-solana + git clone git@github.com:anza-xyz/agave.git twoxtx-solana fi fi