Skip to content
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

Merged
merged 2 commits into from
Nov 1, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 1, 2024

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.

#### 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
@mergify mergify bot added the conflicts label Nov 1, 2024
@mergify mergify bot requested a review from a team as a code owner November 1, 2024 10:44
Copy link
Author

mergify bot commented Nov 1, 2024

Cherry-pick of f9af09c has failed:

On branch mergify/bp/v2.1/pr-3416
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit f9af09ccc6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/scripts/downstream-project-spl-common.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/downstream-project-spl.yml

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

@joncinque
Copy link

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.

Copy link
Member

@yihau yihau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🪖

@t-nelson
Copy link

t-nelson commented Nov 1, 2024

@joncinque did we lose the yaml changes in conflict resolution?

@t-nelson
Copy link

t-nelson commented Nov 1, 2024

or is the description just inaccurate for the 2.1 branch? 🤔

@joncinque
Copy link

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?

@t-nelson
Copy link

t-nelson commented Nov 1, 2024

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

@joncinque joncinque changed the title v2.1: CI: Re-enable downstream SPL jobs (backport of #3416) v2.1: CI: Remove crate patches for downstream SPL jobs (backport of #3416) Nov 1, 2024
@joncinque joncinque merged commit 3ce3be0 into v2.1 Nov 1, 2024
33 checks passed
@joncinque joncinque deleted the mergify/bp/v2.1/pr-3416 branch November 1, 2024 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants