Skip to content

Commit

Permalink
CI: add check for explicit spl-token-cli version (#34430)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
CriesofCarrots and willhickey authored Dec 14, 2023
1 parent ae6a4c0 commit e6e191f
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 0 deletions.
1 change: 1 addition & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ Alternatively use the Github UI.

### Miscellaneous Clean up

1. Pin the spl-token-cli version in the newly promoted stable branch by setting `splTokenCliVersion` in scripts/spl-token-cli-version.sh to the latest release that depends on the stable branch (usually this will be the latest spl-token-cli release).
1. Update [mergify.yml](https://github.com/solana-labs/solana/blob/master/.mergify.yml) to add backport actions for the new branch and remove actions for the obsolete branch.
1. Adjust the [Github backport labels](https://github.com/solana-labs/solana/labels) to add the new branch label and remove the label for the obsolete branch.
1. Announce on Discord #development that the release branch exists so people know to use the new backport labels.
Expand Down
5 changes: 5 additions & 0 deletions ci/check-install-all.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source scripts/spl-token-cli-version.sh
if [[ -z $splTokenCliVersion ]]; then
echo "On the stable channel, splTokenCliVersion must be set in scripts/spl-token-cli-version.sh"
exit 1
fi
4 changes: 4 additions & 0 deletions ci/test-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,8 @@ _ scripts/cargo-for-all-lock-files.sh -- "+${rust_nightly}" fmt --all -- --check

_ ci/do-audit.sh

if [[ -n $CI ]] && [[ $CHANNEL = "stable" ]]; then
_ ci/check-install-all.sh
fi

echo --- ok
4 changes: 4 additions & 0 deletions scripts/cargo-install-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,15 @@ mkdir -p "$installDir/bin"

# Exclude `spl-token` binary for net.sh builds
if [[ -z "$validatorOnly" ]]; then
# shellcheck source=scripts/spl-token-cli-version.sh
source "$here"/spl-token-cli-version.sh

# the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
"$cargo" $maybeRustVersion \
--config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \
--config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \
$maybeSplTokenCliVersionArg \
install --locked spl-token-cli --root "$installDir"
fi
)
Expand Down
8 changes: 8 additions & 0 deletions scripts/spl-token-cli-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# populate this on the stable branch
splTokenCliVersion=

maybeSplTokenCliVersionArg=
if [[ -n "$splTokenCliVersion" ]]; then
# shellcheck disable=SC2034
maybeSplTokenCliVersionArg="--version $splTokenCliVersion"
fi

0 comments on commit e6e191f

Please sign in to comment.