This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git
The following commit(s) were added to refs/heads/master by this push:
new 06c4972 update travis to push "master" tag to Docker on "master"
branch merges (#50)
06c4972 is described below
commit 06c4972458d12e6208e4ef0e0263c181bb3ee922
Author: Eric Weiterman <[email protected]>
AuthorDate: Wed Jun 20 15:58:25 2018 -0400
update travis to push "master" tag to Docker on "master" branch merges (#50)
---
.travis.yml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 06dfd7d..60ba8e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ sudo: required
group: deprecated-2017Q3
language: scala
scala:
-- 2.11.8
+ - 2.11.8
services:
-- docker
+ - docker
notifications:
email: false
@@ -17,16 +17,20 @@ notifications:
secure:
"hS4q3WH3dnXCZAJ/vH9SNQIMnu/AOfdmvSkOhFGgUQE8gUyxdCSwJwPTzOYrDaykXO9GKa5mnYiCarhpQ3TUuHa5X6Ei2M2cYveNED0fwVPahObUqvIW2RmsdXllR0Wrca4JaWsZOsdOcFYKaqOPUFTHL5VZvm01voHp0WerbtB45HxzmDKBDUIDbWe8i8rKFza+hEJqFUmep0Psr2YEmocWnN69GkAQ9Bzew7iFVjicXIh8I2L2sy1dgt0lXESvH51+HT6nfGTm61kjUThEJZ8Qo217rjNLYcoxgHtPMrq4EezfM0l1U2USidu0yyFKHUY4JXH6sfxLw/Rp4Wiphgj5scHiQZ7xbDnwNmwYSmfP6vQ3JwZ5oyckcCjnSryqaD56pUkZjvmxi+OfHTJDN9FrE0kwshWcYBPCww8Uo2nlwrzNpfkxp3bV07iEYAXUIRbFj5gkpzdrp/ZhGuWzCYwRGcpqg
[...]
before_install:
-- "./tools/travis/setup.sh"
+ - "./tools/travis/setup.sh"
install: true
script:
-- "./tools/travis/build.sh && ./tools/travis/deploy.sh &&
./tools/travis/test.sh"
+ - "./tools/travis/build.sh && ./tools/travis/deploy.sh &&
./tools/travis/test.sh"
deploy:
-- provider: script
- script: "./tools/travis/publish.sh openwhisk ${TRAVIS_TAG%@*}
${TRAVIS_TAG##*@}"
- on:
- tags: true
- all_branches: true
+ - provider: script
+ script: "./tools/travis/publish.sh openwhisk ${TRAVIS_TAG%@*}
${TRAVIS_TAG##*@}"
+ on:
+ tags: true
+ all_branches: true
+ - provider: script
+ script: "./tools/travis/publish.sh openwhisk 4.1 master"
+ on:
+ branch: master
env:
global:
- secure:
YqQG7kchpqrqYNCBHmoXs5QJFJQmtuy30WYQnQtudVuqZ1/PqsTJXy6+kNxQ88z5NoU4XZKClB61V8ZVHqGsbQd3lAsTy11QKxf+s4kfsGBuoRlow4eQmnUnnaF3E6KVV2nJ4oXro7RQhP3WwLjpsThrMk322B1ZtlSRALR9hK5wCit8Q1ifSJqmKLwuoNSNQzd7onlDF19Q9pyKkgVu9wLKU5epo76wuFkRfkbr1mB3fF2le2WRNXer2N8rL8McHousFPYA03IIdo6zdX27yGmqSW3teCiVYieGrqtaGhH0WCE7dcmoQ/gs7IBqn1K80wJSR1lbkKDiWzmb73FWScKuXmRn5c4HCq/wPya2I5JNUGyPg5YI0HyMDxGTJ/OdXv2Aizyh3hyNMFjtbjK4N6gz6kFAn8Uo6wFs441Bq+S3+ipLAQ41KIQ7E4/Di6ERSG8KKWKy+LlnA5Qy60CQHRIyJCg3+aqf
[...]
