From 3ce3be0e30f84696c74a25dfa268fe91e52af23a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:52:12 +0100 Subject: [PATCH] v2.1: CI: Remove crate patches for downstream SPL jobs (backport of #3416) (#3421) * CI: Re-enable downstream SPL jobs (#3416) #### Problem The downstream SPL jobs were disabled in #3414 because the crates weren't being patched properly. #### Summary of changes Since the crates are now being properly patched in https://github.com/solana-labs/solana-program-library/pull/7434, re-enable those jobs! At the same time, remove the patch to bump the curve25519-dalek version. (cherry picked from commit f9af09ccc61083a9f0a53977cfd1cd67c6f35562) # Conflicts: # .github/workflows/downstream-project-spl.yml * Fix merge conflict --------- Co-authored-by: Jon C --- .github/scripts/downstream-project-spl-common.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/scripts/downstream-project-spl-common.sh b/.github/scripts/downstream-project-spl-common.sh index f5e0a7e448f729..9f710df6446698 100644 --- a/.github/scripts/downstream-project-spl-common.sh +++ b/.github/scripts/downstream-project-spl-common.sh @@ -24,13 +24,3 @@ if semverGT "$project_used_solana_version" "$SOLANA_VER"; then fi ./patch.crates-io.sh "$SOLANA_DIR" - -# anza migration stopgap. can be removed when agave is fully recommended for public usage. -sed -i 's/solana-geyser-plugin-interface/agave-geyser-plugin-interface/g' ./Cargo.toml - -# should be removed when spl bump their curve25519-dalek -sed -i "s/^curve25519-dalek =.*/curve25519-dalek = \"4.1.3\"/" token/confidential-transfer/proof-generation/Cargo.toml - -# fix curve25519-dalek - -sed -i '/\[patch.crates-io\]/a curve25519-dalek = { git = "https://github.com/anza-xyz/curve25519-dalek.git", rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464" }' ./Cargo.toml