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

CI: add check for explicit spl-token-cli version #34430

Merged

Conversation

CriesofCarrots
Copy link
Contributor

Problem

If https://github.com/solana-labs/solana-program-library releases a new version of spl-token-cli that depends on the beta branch, this cargo-install-all command will likely break, due to rust-version and various other mismatches.

Summary of Changes

Require the stable channel to set an explicit $splTokenCliVersion
Check that this is set in CI
Use $splTokenCliVersion to set a --version for the spl-token-cli cargo install command

Will fix #34429, with backports and (on v1.16) variable population

@CriesofCarrots
Copy link
Contributor Author

Sorry about the premature review request. Just appeasing shellcheck

t-nelson
t-nelson previously approved these changes Dec 13, 2023
Copy link
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

looks great! r+ ci

cc/ @yihau

@CriesofCarrots CriesofCarrots added v1.16 PRs that should be backported to v1.16 v1.17 PRs that should be backported to v1.17 labels Dec 13, 2023
Copy link
Contributor

mergify bot commented Dec 13, 2023

Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule.

Copy link
Contributor

mergify bot commented Dec 13, 2023

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

@willhickey
Copy link
Contributor

Just confirming the expected process...

After a new minor version branch is created, PRs against the new-stable will fail until we update scripts/spl-token-cli-version.sh in that new-stable branch to pin a version here:
splTokenCliVersion=

If that's correct then this won't break any of the existing processes.

@CriesofCarrots
Copy link
Contributor Author

After a new minor version branch is created, PRs against the new-stable will fail until we update scripts/spl-token-cli-version.sh in that new-stable branch to pin a version here:
splTokenCliVersion=

Yes, that's correct. Thanks for assessing, @willhickey !
Is populating $splTokenCliVersion something that makes sense for the minor-version branch creator to do? Or do we just let it be everyone's problem?

@CriesofCarrots
Copy link
Contributor Author

@t-nelson , do you mind re-approving? I can't approve Will's release.md change

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.

🫶

@CriesofCarrots
Copy link
Contributor Author

Thanks @yihau !!

@CriesofCarrots CriesofCarrots merged commit e6e191f into solana-labs:master Dec 14, 2023
16 checks passed
mergify bot pushed a commit that referenced this pull request Dec 14, 2023
* Add script to specify spl-token-cli version

* Add check for spl-token-cli version to CI

* Add minor release branch cleanup instruction to unblock CI on the new stable branch

---------

Co-authored-by: Will Hickey <will.hickey@solana.com>
(cherry picked from commit e6e191f)
mergify bot pushed a commit that referenced this pull request Dec 14, 2023
* Add script to specify spl-token-cli version

* Add check for spl-token-cli version to CI

* Add minor release branch cleanup instruction to unblock CI on the new stable branch

---------

Co-authored-by: Will Hickey <will.hickey@solana.com>
(cherry picked from commit e6e191f)
mergify bot added a commit that referenced this pull request Dec 14, 2023
…34430) (#34465)

CI: add check for explicit spl-token-cli version (#34430)

* Add script to specify spl-token-cli version

* Add check for spl-token-cli version to CI

* Add minor release branch cleanup instruction to unblock CI on the new stable branch

---------

Co-authored-by: Will Hickey <will.hickey@solana.com>
(cherry picked from commit e6e191f)

Co-authored-by: Tyera <tyera@solana.com>
mergify bot added a commit that referenced this pull request Dec 14, 2023
…34430) (#34464)

* CI: add check for explicit spl-token-cli version (#34430)

* Add script to specify spl-token-cli version

* Add check for spl-token-cli version to CI

* Add minor release branch cleanup instruction to unblock CI on the new stable branch

---------

Co-authored-by: Will Hickey <will.hickey@solana.com>
(cherry picked from commit e6e191f)

* Set spl-token-cli version for installs

---------

Co-authored-by: Tyera <tyera@solana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.16 PRs that should be backported to v1.16 v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error running cargo-install-all.sh on v1.16.23
4 participants