-
Notifications
You must be signed in to change notification settings - Fork 200
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
v2.1: CI: Remove crate patches for downstream SPL jobs (backport of #3416) #3421
Conversation
#### 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
Cherry-pick of f9af09c has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Even though this change doesn't have a material impact on the code, it will ensure that the downstream jobs stay stable in the 2.1 branch, in case there's another change to the curve25519-dalek dependency. Although we likely don't need this change, it's safer to have it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🪖
@joncinque did we lose the yaml changes in conflict resolution? |
or is the description just inaccurate for the 2.1 branch? 🤔 |
Just inaccurate description, the jobs were never disabled in v2.1 with #3414 -- should I update the description? |
that'd probably avoid historical confusion |
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.
This is an automatic backport of pull request #3416 done by Mergify.