aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-02-13 20:14:05 +0800
committerGitHub <noreply@github.com>2017-02-13 20:14:05 +0800
commit8a8666155dd98e372cbc3b544531ef31692d34cd (patch)
tree2fa8c2bd4d18f7c6b18d1f5a5867f77d0e7757cb
parent85492eb8fdec5e5c5fe38044a12e252519a892f3 (diff)
parentbc3e3fd7090def8f4da81c44b31a86c1fda19414 (diff)
downloaddexon-solidity-8a8666155dd98e372cbc3b544531ef31692d34cd.tar.gz
dexon-solidity-8a8666155dd98e372cbc3b544531ef31692d34cd.tar.zst
dexon-solidity-8a8666155dd98e372cbc3b544531ef31692d34cd.zip
Merge pull request #1690 from ethereum/failifdockerdeployfalide
Fix test expressions.
-rwxr-xr-xscripts/docker_deploy.sh27
1 files changed, 16 insertions, 11 deletions
diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh
index fe157044..d2810a3e 100755
--- a/scripts/docker_deploy.sh
+++ b/scripts/docker_deploy.sh
@@ -4,15 +4,20 @@ set -e
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
version=$(grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? $(dirname "$0")/../CMakeLists.txt)
-if [ "$TRAVIS_BRANCH" == "develop" ]; then
- docker tag ethereum/solc:build ethereum/solc:nightly;
- docker tag ethereum/solc:build ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT"
- docker push ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT";
- docker push ethereum/solc:nightly;
-elif [ "$TRAVIS_BRANCH" == "release"]; then
- docker tag ethereum/solc:build ethereum/solc:stable;
- docker push ethereum/solc:stable;
-elif [ "$TRAVIS_TAG" == v"$version"]; then
- docker tag ethereum/solc:build ethereum/solc:"$version";
- docker push ethereum/solc:"$version";
+if [ "$TRAVIS_BRANCH" = "develop" ]
+then
+ docker tag ethereum/solc:build ethereum/solc:nightly;
+ docker tag ethereum/solc:build ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT"
+ docker push ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT";
+ docker push ethereum/solc:nightly;
+elif [ "$TRAVIS_BRANCH" = "release" ]
+then
+ docker tag ethereum/solc:build ethereum/solc:stable;
+ docker push ethereum/solc:stable;
+elif [ "$TRAVIS_TAG" = v"$version" ]
+then
+ docker tag ethereum/solc:build ethereum/solc:"$version";
+ docker push ethereum/solc:"$version";
+else
+ echo "Not publishing docker image from branch $TRAVIS_BRANCH or tag $TRAVIS_TAG"
fi