Skip to content

Commit 4ef6f54

Browse files
joncinquemergify[bot]
authored andcommitted
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
1 parent 35a130a commit 4ef6f54

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

.github/scripts/downstream-project-spl-common.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,3 @@ if semverGT "$project_used_solana_version" "$SOLANA_VER"; then
2424
fi
2525

2626
./patch.crates-io.sh "$SOLANA_DIR"
27-
28-
# anza migration stopgap. can be removed when agave is fully recommended for public usage.
29-
sed -i 's/solana-geyser-plugin-interface/agave-geyser-plugin-interface/g' ./Cargo.toml
30-
31-
# should be removed when spl bump their curve25519-dalek
32-
sed -i "s/^curve25519-dalek =.*/curve25519-dalek = \"4.1.3\"/" token/confidential-transfer/proof-generation/Cargo.toml
33-
34-
# fix curve25519-dalek
35-
36-
sed -i '/\[patch.crates-io\]/a curve25519-dalek = { git = "https://github.com/anza-xyz/curve25519-dalek.git", rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464" }' ./Cargo.toml

.github/workflows/downstream-project-spl.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ jobs:
144144
- [name-service/program]
145145
- [stake-pool/program]
146146
- [single-pool/program]
147+
<<<<<<< HEAD
147148

149+
=======
150+
>>>>>>> f9af09ccc6 (CI: Re-enable downstream SPL jobs (#3416))
148151
steps:
149152
- uses: actions/checkout@v4
150153

0 commit comments

Comments
 (0)