Permalink
Browse files

fix typo in docker build step; make sure build fails if any step fails

  • Loading branch information...
sburnicki committed Sep 24, 2018
1 parent f5ac351 commit dd86a6fbfa0050ce12c156b547bf3709a403b0f9
Showing with 14 additions and 14 deletions.
  1. +13 −13 .travis.yml
  2. +1 −1 build.gradle
@@ -65,12 +65,12 @@ jobs:
deploy:
provider: script
script:
groovy scripts/ci/building/set_new_versionnumber_travis_dev;
./gradlew assemble;
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
docker build -t iteratec/openspeedmonitor:develop .;
docker push iteratec/openspeedmonitor:develop;
curl --user $BAMBOO_TU_USERNAME:$BAMBOO_TU_PASSWORD -X POST -d "$STAGE_NAME&ExecuteAllStages" $BAMBOO_BUILD_ADDRESS;
groovy scripts/ci/building/set_new_versionnumber_travis_dev &&
./gradlew assemble &&
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&
docker build -t iteratec/openspeedmonitor:develop . &&
docker push iteratec/openspeedmonitor:develop &&
curl --user $BAMBOO_TU_USERNAME:$BAMBOO_TU_PASSWORD -X POST -d "$STAGE_NAME&ExecuteAllStages" $BAMBOO_BUILD_ADDRESS &&
git stash -u; # in order to prevent double checking of cached resources
on:
branch: develop
@@ -80,16 +80,16 @@ jobs:
deploy:
provider: script
script:
./gradlew assemble;
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
docker build iteratec/openspeedmonitor .;
groovy scripts/ci/building/set_new_versionnumber;
bash scripts/ci/building/push_and_tag_dockerimage_travis.sh;
curl --user $BAMBOO_TU_USERNAME:$BAMBOO_TU_PASSWORD -X POST -d "$STAGE_NAME&ExecuteAllStages" $BAMBOO_RELEASE_BUILD_ADDRESS;
./gradlew assemble &&
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&
docker build -t iteratec/openspeedmonitor . &&
groovy scripts/ci/building/set_new_versionnumber &&
bash scripts/ci/building/push_and_tag_dockerimage_travis.sh &&
curl --user $BAMBOO_TU_USERNAME:$BAMBOO_TU_PASSWORD -X POST -d "$STAGE_NAME&ExecuteAllStages" $BAMBOO_RELEASE_BUILD_ADDRESS &&
git stash -u;
on:
branch: release
after_success:
after_deploy:
- test $TRAVIS_BRANCH = "release" && bash scripts/ci/building/merge_release_into_dev_and_master.sh;
@@ -36,7 +36,7 @@ buildscript {
}
}
version "5.0.0"
version "4.9.9"
group "OpenSpeedMonitor"
apply plugin: "eclipse"

0 comments on commit dd86a6f

Please sign in to comment.