diff --git a/ci/format-url.sh b/ci/format-url.sh new file mode 100755 index 0000000000..96fba33586 --- /dev/null +++ b/ci/format-url.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# +# Formats a URL to be clickable from a Buildkite log +# + +if [[ $# -eq 0 ]]; then + echo "Usage: $0 url" + exit 1 +fi + +if [[ -z $BUILDKITE ]]; then + echo "$1" +else + # shellcheck disable=SC2001 + URL="$(echo "$1" | sed 's/;/%3b/g')" # Escape ; + + printf '\033]1339;url=' + echo -n "$URL" + printf '\a\n' +fi diff --git a/ci/publish-solana-tar.sh b/ci/publish-solana-tar.sh index 147ed5e4c6..2e4aae840a 100755 --- a/ci/publish-solana-tar.sh +++ b/ci/publish-solana-tar.sh @@ -62,23 +62,23 @@ echo --- Saving build artifacts source ci/upload-ci-artifact.sh upload-ci-artifact solana-release.tar.bz2 -if [[ -z $DO_NOT_PUBLISH_TAR ]]; then - echo --- AWS S3 Store - if [[ -z $DRYRUN ]]; then - ( - set -x - if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then - rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1 - $DRYRUN wget https://github.com/s3tools/s3cmd/releases/download/v2.0.1/s3cmd-2.0.1.tar.gz - $DRYRUN tar zxf s3cmd-2.0.1.tar.gz - fi - - $DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \ - s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2 - ) - else - echo Skipped due to DRYRUN - fi +if [[ -n $DO_NOT_PUBLISH_TAR ]]; then + echo Skipped due to DO_NOT_PUBLISH_TAR + exit 0 fi -exit 0 +echo --- AWS S3 Store +( + set -x + if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then + rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1 + $DRYRUN wget https://github.com/s3tools/s3cmd/releases/download/v2.0.1/s3cmd-2.0.1.tar.gz + $DRYRUN tar zxf s3cmd-2.0.1.tar.gz + fi + + $DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \ + s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2 + + echo Published to: + $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/solana-release.tar.bz2 +)