Skip to content

v1.18: ci: skip spl test when version is too high (backport of #1945)#1960

Merged
steviez merged 2 commits intov1.18from
mergify/bp/v1.18/pr-1945
Jul 2, 2024
Merged

v1.18: ci: skip spl test when version is too high (backport of #1945)#1960
steviez merged 2 commits intov1.18from
mergify/bp/v1.18/pr-1945

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Jul 2, 2024

Problem

it makes no sense to run spl tests with lower version. actually we did it before but the logic missed accidentally. solana-labs#27326

Summary of Changes

stop running spl tests when it bump to higher version


This is an automatic backport of pull request #1945 done by Mergify.

@mergify mergify Bot requested a review from a team as a code owner July 2, 2024 04:27
@mergify mergify Bot added the conflicts label Jul 2, 2024
@mergify mergify Bot assigned yihau Jul 2, 2024
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Jul 2, 2024

Cherry-pick of 4d9d27f has failed:

On branch mergify/bp/v1.18/pr-1945
Your branch is up to date with 'origin/v1.18'.

You are currently cherry-picking commit 4d9d27f1ff.
  (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

@yihau
Copy link
Copy Markdown
Member

yihau commented Jul 2, 2024

Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

LGTM - I made some comments about why this is needed on the v2.0 BP PR, those comments apply here as well except that v1.18 CI is actually broken without this change.

Lastly, as @yihau pointed out in #1960 (comment), we can see that the check is working as intended here on the v1.18 branch

Copy link
Copy Markdown

@CriesofCarrots CriesofCarrots left a comment

Choose a reason for hiding this comment

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

Needs rebase?

yihau added 2 commits July 2, 2024 14:24
(cherry picked from commit 4d9d27f)

# Conflicts:
#	.github/workflows/downstream-project-spl.yml
@steviez
Copy link
Copy Markdown

steviez commented Jul 2, 2024

Needs rebase?

Yeah, we should be able to get all greens with rebase. I was hesitant to rebase it and make my ship it not count towards the two necessary to push, but let's rebase and we can voluntell one more reviewer.

Edit: Oh wait, I forgot; rebase won't clear the reviews!

@steviez steviez force-pushed the mergify/bp/v1.18/pr-1945 branch from 1f2ebfc to de4184d Compare July 2, 2024 19:26
@steviez steviez merged commit af3098e into v1.18 Jul 2, 2024
@steviez steviez deleted the mergify/bp/v1.18/pr-1945 branch July 2, 2024 20:24
@CriesofCarrots
Copy link
Copy Markdown

Oh wait, I forgot; rebase won't clear the reviews!

Yeah, I always forget this too! It's nice that github has gotten more rational in this one case.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants