gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include TARGET in release URL to make room for future targets

Browse Source
This commit is contained in:
Michael Vines
2019-03-20 13:37:55 -07:00
committed by Grimes
parent 3048de18bb
commit 791ead6053
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ci/publish-tarball.sh
View File

@ -24,13 +24,6 @@ if [[ -z $CHANNEL_OR_TAG ]]; then
exit 1 exit 1
fi fi
echo --- Creating tarball
(
set -x
rm -rf solana-release/
mkdir solana-release/
case "$(uname)" in case "$(uname)" in
Darwin) Darwin)
TARGET=x86_64-apple-darwin TARGET=x86_64-apple-darwin
@ -42,6 +35,13 @@ echo --- Creating tarball
TARGET=unknown-unknown-unknown TARGET=unknown-unknown-unknown
;; ;;
esac esac
echo --- Creating tarball
(
set -x
rm -rf solana-release/
mkdir solana-release/
COMMIT="$(git rev-parse HEAD)" COMMIT="$(git rev-parse HEAD)"
( (
@ -62,19 +62,22 @@ echo --- Creating tarball
) )
cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda
tar jvcf solana-release.tar.bz2 solana-release/ tar jvcf solana-release.tar-$TARGET.bz2 solana-release/
cp solana-release/bin/solana-install-$TARGET .
) )
echo --- Saving build artifacts echo --- Saving build artifacts
source ci/upload-ci-artifact.sh source ci/upload-ci-artifact.sh
upload-ci-artifact solana-release.tar.bz2 upload-ci-artifact solana-release-$TARGET.tar.bz2
if [[ -n $DO_NOT_PUBLISH_TAR ]]; then if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
echo Skipped due to DO_NOT_PUBLISH_TAR echo Skipped due to DO_NOT_PUBLISH_TAR
exit 0 exit 0
fi fi
echo --- AWS S3 Store for file in solana-release-$TARGET.tar.bz2 solana-install-$TARGET; do
echo --- AWS S3 Store: $file
( (
set -x set -x
$DRYRUN docker run \ $DRYRUN docker run \
@ -83,11 +86,11 @@ echo --- AWS S3 Store
--env AWS_SECRET_ACCESS_KEY \ --env AWS_SECRET_ACCESS_KEY \
--volume "$PWD:/solana" \ --volume "$PWD:/solana" \
eremite/aws-cli:2018.12.18 \ eremite/aws-cli:2018.12.18 \
/usr/bin/s3cmd --acl-public put /solana/solana-release.tar.bz2 \ /usr/bin/s3cmd --acl-public put /solana/"$file" s3://solana-release/"$CHANNEL_OR_TAG"/"$file"
s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
echo Published to: echo Published to:
$DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/solana-release.tar.bz2 $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/"$file"
) )
done
echo --- ok echo --- ok

3
net/net.sh
View File

@ -278,7 +278,8 @@ start() {
rm -f "$SOLANA_ROOT"/solana-release.tar.bz2 rm -f "$SOLANA_ROOT"/solana-release.tar.bz2
( (
set -x set -x
curl -o "$SOLANA_ROOT"/solana-release.tar.bz2 http://solana-release.s3.amazonaws.com/"$releaseChannel"/solana-release.tar.bz2 curl -o "$SOLANA_ROOT"/solana-release.tar.bz2 \
http://solana-release.s3.amazonaws.com/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2
) )
tarballFilename="$SOLANA_ROOT"/solana-release.tar.bz2 tarballFilename="$SOLANA_ROOT"/solana-release.tar.bz2
fi fi