Shorten magic install URL

This commit is contained in:
Michael Vines 2020-10-23 13:57:47 -07:00 committed by mergify[bot]
parent c7f4f15e60
commit b5170b993e
3 changed files with 38 additions and 8 deletions

View File

@ -124,7 +124,7 @@ for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.
/usr/bin/s3cmd --acl-public put /solana/"$file" s3://release.solana.com/"$CHANNEL_OR_TAG"/"$file" /usr/bin/s3cmd --acl-public put /solana/"$file" s3://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
echo Published to: echo Published to:
$DRYRUN ci/format-url.sh http://release.solana.com/"$CHANNEL_OR_TAG"/"$file" $DRYRUN ci/format-url.sh https://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
) )
if [[ -n $TAG ]]; then if [[ -n $TAG ]]; then
@ -147,4 +147,30 @@ for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.
fi fi
done done
# Create install wrapper for release.solana.com
if [[ -n $BUILDKITE ]]; then
cat > release.solana.com-install <<EOF
SOLANA_RELEASE=$CHANNEL_OR_TAG
SOLANA_INSTALL_INIT_ARGS=$CHANNEL_OR_TAG
SOLANA_DOWNLOAD_ROOT=http://release.solana.com
EOF
cat install/solana-install-init.sh >> release.solana.com-install
echo --- AWS S3 Store: "install"
(
set -x
$DRYRUN docker run \
--rm \
--env AWS_ACCESS_KEY_ID \
--env AWS_SECRET_ACCESS_KEY \
--volume "$PWD:/solana" \
eremite/aws-cli:2018.12.18 \
/usr/bin/s3cmd --acl-public put /solana/release.solana.com-install s3://release.solana.com/"$CHANNEL_OR_TAG"/install
echo Published to:
$DRYRUN ci/format-url.sh https://release.solana.com/"$CHANNEL_OR_TAG"/install
)
fi
echo --- ok echo --- ok

View File

@ -20,17 +20,16 @@ depending on your preferred workflow:
machine by running: machine by running:
```bash ```bash
curl -sSf https://raw.githubusercontent.com/solana-labs/solana/LATEST_SOLANA_RELEASE_VERSION/install/solana-install-init.sh | sh -s - LATEST_SOLANA_RELEASE_VERSION sh -c "$(curl -sSfL https://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/install)"
``` ```
- If you are connecting to a different testnet, you can replace `LATEST_SOLANA_RELEASE_VERSION` with the - You can replace `LATEST_SOLANA_RELEASE_VERSION` with the release tag matching
release tag matching the software version of your desired testnet, or replace it the software version of your desired release, or use one of the three symbolic
with the named channel `stable`, `beta`, or `edge`. channel names: `stable`, `beta`, or `edge`.
- The following output indicates a successful update: - The following output indicates a successful update:
```text ```text
looking for latest release
downloading LATEST_SOLANA_RELEASE_VERSION installer downloading LATEST_SOLANA_RELEASE_VERSION installer
Configuration: /home/solana/.config/solana/install/config.yml Configuration: /home/solana/.config/solana/install/config.yml
Active release directory: /home/solana/.local/share/solana/install/active_release Active release directory: /home/solana/.local/share/solana/install/active_release
@ -72,7 +71,7 @@ solana --version
installer into a temporary directory: installer into a temporary directory:
```bash ```bash
curl http://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-msvc.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs curl https://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-msvc.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs
``` ```
- Copy and paste the following command, then press Enter to install the latest - Copy and paste the following command, then press Enter to install the latest

View File

@ -108,7 +108,12 @@ main() {
exit 1 exit 1
fi fi
ignore "$solana_install_init" "$@" if [ -z "$1" ]; then
#shellcheck disable=SC2086
ignore "$solana_install_init" $SOLANA_INSTALL_INIT_ARGS
else
ignore "$solana_install_init" "$@"
fi
retval=$? retval=$?
ignore rm "$solana_install_init" ignore rm "$solana_install_init"