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

Remove channel duplication

This commit is contained in:
Michael Vines 2019-01-12 10:43:43 -08:00 committed by Grimes
parent 094bc59553
commit 5b92286568
4 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ci/channel-info.sh
View File

@ -82,10 +82,26 @@ for tag in "${tags[@]}"; do
fi fi
done done
echo EDGE_CHANNEL=master EDGE_CHANNEL=master
echo BETA_CHANNEL="${beta:+v$beta}" BETA_CHANNEL=${beta:+v$beta}
echo STABLE_CHANNEL="${stable:+v$stable}" STABLE_CHANNEL=${stable:+v$stable}
echo BETA_CHANNEL_LATEST_TAG="${beta_tag:+v$beta_tag}" BETA_CHANNEL_LATEST_TAG=${beta_tag:+v$beta_tag}
echo STABLE_CHANNEL_LATEST_TAG="${stable_tag:+v$stable_tag}" STABLE_CHANNEL_LATEST_TAG=${stable_tag:+v$stable_tag}
if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
CHANNEL=stable
elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
CHANNEL=edge
elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
CHANNEL=beta
fi
echo EDGE_CHANNEL="$EDGE_CHANNEL"
echo BETA_CHANNEL="$BETA_CHANNEL"
echo BETA_CHANNEL_LATEST_TAG="$BETA_CHANNEL_LATEST_TAG"
echo STABLE_CHANNEL="$STABLE_CHANNEL"
echo STABLE_CHANNEL_LATEST_TAG="$STABLE_CHANNEL_LATEST_TAG"
echo CHANNEL="$CHANNEL"
exit 0 exit 0

14
ci/publish-snap.sh
View File

@ -19,14 +19,6 @@ fi
eval "$(ci/channel-info.sh)" eval "$(ci/channel-info.sh)"
if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
CHANNEL=stable
elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
CHANNEL=edge
elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
CHANNEL=beta
fi
if [[ -z $CHANNEL ]]; then if [[ -z $CHANNEL ]]; then
echo Unable to determine channel to publish into, exiting. echo Unable to determine channel to publish into, exiting.
exit 1 exit 1
@ -61,13 +53,13 @@ if [[ ! -x /usr/bin/multilog ]]; then
sudo apt-get install -y daemontools sudo apt-get install -y daemontools
fi fi
echo --- build: $CHANNEL channel echo "--- build: $CHANNEL channel"
snapcraft snapcraft
source ci/upload-ci-artifact.sh source ci/upload-ci-artifact.sh
upload-ci-artifact solana_*.snap upload-ci-artifact solana_*.snap
if [[ -z $DO_NOT_PUBLISH_SNAP ]]; then if [[ -z $DO_NOT_PUBLISH_SNAP ]]; then
echo --- publish: $CHANNEL channel echo "--- publish: $CHANNEL channel"
$DRYRUN snapcraft push solana_*.snap --release $CHANNEL $DRYRUN snapcraft push solana_*.snap --release "$CHANNEL"
fi fi

8
ci/publish-tarball.sh
View File

@ -11,14 +11,6 @@ fi
eval "$(ci/channel-info.sh)" eval "$(ci/channel-info.sh)"
if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
CHANNEL=stable
elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
CHANNEL=edge
elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
CHANNEL=beta
fi
if [[ -n "$BUILDKITE_TAG" ]]; then if [[ -n "$BUILDKITE_TAG" ]]; then
CHANNEL_OR_TAG=$BUILDKITE_TAG CHANNEL_OR_TAG=$BUILDKITE_TAG
elif [[ -n "$TRIGGERED_BUILDKITE_TAG" ]]; then elif [[ -n "$TRIGGERED_BUILDKITE_TAG" ]]; then

12
sdk/docker-solana/build.sh
View File

@ -4,14 +4,6 @@ set -ex
cd "$(dirname "$0")" cd "$(dirname "$0")"
eval "$(../../ci/channel-info.sh)" eval "$(../../ci/channel-info.sh)"
if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
CHANNEL=stable
elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
CHANNEL=edge
elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
CHANNEL=beta
fi
if [[ -z $CHANNEL ]]; then if [[ -z $CHANNEL ]]; then
echo Unable to determine channel to publish into, exiting. echo Unable to determine channel to publish into, exiting.
echo "^^^ +++" echo "^^^ +++"
@ -24,7 +16,7 @@ rm -rf usr/
cp -f entrypoint.sh usr/bin/solana-entrypoint.sh cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
docker build -t solanalabs/solana:$CHANNEL . docker build -t solanalabs/solana:"$CHANNEL" .
maybeEcho= maybeEcho=
if [[ -z $CI ]]; then if [[ -z $CI ]]; then
@ -38,4 +30,4 @@ else
fi fi
) )
fi fi
$maybeEcho docker push solanalabs/solana:$CHANNEL $maybeEcho docker push solanalabs/solana:"$CHANNEL"