From 2319659170f655cf6d088a418f65576238440d1c Mon Sep 17 00:00:00 2001 From: Etienne Napoleone Date: Tue, 21 Aug 2018 16:24:49 +0700 Subject: [PATCH 1/2] Update .travis.yml fix tag conditions --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a78bd513..1aa85aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ jobs: - stage: Coverage script: npm run coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage - - stage: Build and push untagged commit into image tomomaster + - stage: Build and push tomochain image (untagged) services: - docker install: skip @@ -25,7 +25,7 @@ jobs: after_success: - curl -X POST $INFRA_IMAGE_REBUILD_HOOK - - stage: Build and push tagged commit into image tomomaster + - stage: Build and push tomochain image (tagged) services: - docker install: skip @@ -44,7 +44,7 @@ stages: - name: Lint - name: Test - name: Coverage - - name: Build and push untagged commit into image tomomaster - if: type != pull_request AND branch = master AND tag IS blank AND repo = tomochain/tomomaster - - name: Build and push tagged commit into image tomomaster - if: type != pull_request AND branch = master AND tag = true AND repo = tomochain/tomomaster + - name: Build and push tomochain image (untagged) + if: type != pull_request AND branch = AND tag IS blank AND repo = tomochain/tomomaster + - name: Build and push tomochain image (tagged) + if: type != pull_request AND branch =~ ^v AND tag IS present AND repo = tomochain/tomomaster From a1db3cc7ea443b611d5050daf4313d56a435c014 Mon Sep 17 00:00:00 2001 From: Etienne Napoleone Date: Tue, 21 Aug 2018 16:33:10 +0700 Subject: [PATCH 2/2] Update .travis.yml typo --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1aa85aa1..70dd7b9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ jobs: - stage: Coverage script: npm run coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage - - stage: Build and push tomochain image (untagged) + - stage: Build and push tomomaster image (untagged) services: - docker install: skip @@ -25,7 +25,7 @@ jobs: after_success: - curl -X POST $INFRA_IMAGE_REBUILD_HOOK - - stage: Build and push tomochain image (tagged) + - stage: Build and push tomomaster image (tagged) services: - docker install: skip @@ -44,7 +44,7 @@ stages: - name: Lint - name: Test - name: Coverage - - name: Build and push tomochain image (untagged) + - name: Build and push tomomaster image (untagged) if: type != pull_request AND branch = AND tag IS blank AND repo = tomochain/tomomaster - - name: Build and push tomochain image (tagged) + - name: Build and push tomomaster image (tagged) if: type != pull_request AND branch =~ ^v AND tag IS present AND repo = tomochain/tomomaster