blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow ci/publish_tarball.sh's output to be configured (#10480) 

automerge
This commit is contained in:
Trent Nelson 2020-06-09 16:40:41 -06:00 committed by GitHub
parent 8e2745c2a2
commit aaf6dd9ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ci/publish-tarball.sh
View File

@ -53,11 +53,14 @@ windows)
;; ;;
esac esac
RELEASE_BASENAME="${RELEASE_BASENAME:=solana-release}"
TARBALL_BASENAME="${TARBALL_BASENAME:="$RELEASE_BASENAME"}"
echo --- Creating release tarball echo --- Creating release tarball
( (
set -x set -x
rm -rf solana-release/ rm -rf "${RELEASE_BASENAME:?}"/
mkdir solana-release/ mkdir "${RELEASE_BASENAME}"/
COMMIT="$(git rev-parse HEAD)" COMMIT="$(git rev-parse HEAD)"
@ -65,18 +68,18 @@ echo --- Creating release tarball
echo "channel: $CHANNEL_OR_TAG" echo "channel: $CHANNEL_OR_TAG"
echo "commit: $COMMIT" echo "commit: $COMMIT"
echo "target: $TARGET" echo "target: $TARGET"
) > solana-release/version.yml ) > "${RELEASE_BASENAME}"/version.yml
# Make CHANNEL available to include in the software version information # Make CHANNEL available to include in the software version information
export CHANNEL export CHANNEL
source ci/rust-version.sh stable source ci/rust-version.sh stable
scripts/cargo-install-all.sh +"$rust_stable" solana-release scripts/cargo-install-all.sh +"$rust_stable" "${RELEASE_BASENAME}"
tar cvf solana-release-$TARGET.tar solana-release tar cvf "${TARBALL_BASENAME}"-$TARGET.tar "${RELEASE_BASENAME}"
bzip2 solana-release-$TARGET.tar bzip2 "${TARBALL_BASENAME}"-$TARGET.tar
cp solana-release/bin/solana-install-init solana-install-init-$TARGET cp "${RELEASE_BASENAME}"/bin/solana-install-init solana-install-init-$TARGET
cp solana-release/version.yml solana-release-$TARGET.yml cp "${RELEASE_BASENAME}"/version.yml "${TARBALL_BASENAME}"-$TARGET.yml
) )
# Metrics tarball is platform agnostic, only publish it from Linux # Metrics tarball is platform agnostic, only publish it from Linux
@ -94,7 +97,7 @@ fi
source ci/upload-ci-artifact.sh source ci/upload-ci-artifact.sh
for file in solana-release-$TARGET.tar.bz2 solana-release-$TARGET.yml solana-install-init-"$TARGET"* $MAYBE_TARBALLS; do for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.yml solana-install-init-"$TARGET"* $MAYBE_TARBALLS; do
if [[ -n $DO_NOT_PUBLISH_TAR ]]; then if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
upload-ci-artifact "$file" upload-ci-artifact "$file"
echo "Skipped $file due to DO_NOT_PUBLISH_TAR" echo "Skipped $file due to DO_NOT_PUBLISH_TAR"