From e9ae50dc5994a02119655eff4ed488fb3918d41f Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Thu, 9 Feb 2017 11:36:08 -0600 Subject: clarify branches for docker to push on and clarify where to find cmakelists.txt Signed-off-by: RJ Catalano --- scripts/docker_deploy.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh index 870cca44..dcd03f9e 100755 --- a/scripts/docker_deploy.sh +++ b/scripts/docker_deploy.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; -version=$(grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? $(dirname "$0")/CMakeLists.txt) +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" @@ -9,9 +9,8 @@ if [ "$TRAVIS_BRANCH" == "develop" ]; then 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_BRANCH" == v"$version"]; then docker tag ethereum/solc:build ethereum/solc:"$version"; - docker tag ethereum/solc:build ethereum/solc: - docker push ethereum/solc; docker push ethereum/solc:"$version"; - docker push ethereum/solc:stable; fi \ No newline at end of file -- cgit