Skip to content

Commit

Permalink
CI: Re-enable downstream SPL jobs (solana-labs#3416)
Browse files Browse the repository at this point in the history
#### Problem

The downstream SPL jobs were disabled in solana-labs#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.
  • Loading branch information
joncinque authored Nov 1, 2024
1 parent d9c24ed commit f9af09c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 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
3 changes: 0 additions & 3 deletions .github/workflows/downstream-project-spl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ env:
jobs:
check:
if: github.repository == 'anza-xyz/agave'
if: false # Re-enable once downstream job is fixed
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -92,7 +91,6 @@ jobs:
],
},
]
if: false # Re-enable once downstream job is fixed
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -146,7 +144,6 @@ jobs:
- [name-service/program]
- [stake-pool/program]
- [single-pool/program]
if: false # Re-enable once downstream job is fixed
steps:
- uses: actions/checkout@v4

Expand Down

0 comments on commit f9af09c

Please sign in to comment.