Skip to content

Commit

Permalink
Merge pull request #205 from Augmint/travis_config
Browse files Browse the repository at this point in the history
travis config: fix checking version tags
  • Loading branch information
Peter Petrovics authored Apr 23, 2019
2 parents f969012 + 43cca28 commit 119bc04
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
dist: xenial # https://docs.travis-ci.com/user/reference/xenial/
language: node_js
cache: yarn
env:
global:
# value is master if tag build AND on master https://github.com/travis-ci/travis-ci/issues/5419#issuecomment-222815942
- BRANCH_OF_TAG=$(git branch --contains $TRAVIS_TAG | grep -l '^[\* ] master$')
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
- export PATH="$HOME/.yarn/bin:$PATH"
Expand Down Expand Up @@ -33,13 +29,13 @@ after_success:
- wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- ./send.sh success $DISCORD_WEBHOOK_URL
- echo after_success TRAVIS_BRANCH=$TRAVIS_BRANCH BRANCH_OF_TAG=$BRANCH_OF_TAG TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST TRAVIS_TAG=$TRAVIS_TAG TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER TRAVIS_COMMIT=$TRAVIS_COMMIT ;
- echo after_success TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST TRAVIS_TAG=$TRAVIS_TAG TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER TRAVIS_COMMIT=$TRAVIS_COMMIT ;
- |
if [ $TRAVIS_PULL_REQUEST == "false" ]; then
if [ $TRAVIS_BRANCH == "master" ] || [ $BRANCH_OF_TAG == "master" ]; then
if [ $TRAVIS_BRANCH == "master" ] || [[ $TRAVIS_TAG =~ v([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then
echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ;
yarn docker:tag:build ;
if [ ! -z "$VERSION_TAG" ]; then
if [ ! -z $TRAVIS_TAG ]; then
yarn docker:tag:version $TRAVIS_TAG;
fi
yarn docker:tag:latest; # NB: it will tag old version with latest if you tag an old commit on master
Expand Down

0 comments on commit 119bc04

Please sign in to comment.