Skip to content

Commit

Permalink
v2.1: CI: Remove crate patches for downstream SPL jobs (backport of #…
Browse files Browse the repository at this point in the history
…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
solana-labs/solana-program-library#7434,
re-enable those jobs! At the same time, remove the patch to bump the
curve25519-dalek version.

(cherry picked from commit f9af09c)

# Conflicts:
#	.github/workflows/downstream-project-spl.yml

* Fix merge conflict

---------

Co-authored-by: Jon C <[email protected]>
  • Loading branch information
mergify[bot] and joncinque authored Nov 1, 2024
1 parent b76df54 commit 3ce3be0
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions .github/scripts/downstream-project-spl-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3ce3be0

Please sign in to comment.