From 2c0aa449d64a9fc1095a8da9aedc4ff9920b193f Mon Sep 17 00:00:00 2001 From: Martin Staffa Date: Mon, 27 Nov 2017 12:14:05 +0100 Subject: [PATCH 1/2] chore(travis: fix deployment condition to include tagged commits --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d86faa8ea81e..8aa06d3de434 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,10 +53,10 @@ notifications: jobs: include: - stage: deploy - # Don't deploy from PRs and only from our default branches. + # Don't deploy from PRs and only from our default branches, or if tag exists # This is a Travis-specific boolean language: https://docs.travis-ci.com/user/conditional-builds-stages-jobs#Specifying-conditions # The deployment logic for pushed branches is further defined in scripts\travis\build.sh - if: type != pull_request and branch =~ ^(v1\.\d+\.x|master)$ + if: type != pull_request and (branch =~ ^(v1\.\d+\.x|master)$ or tag IS present) env: - JOB=deploy before_script: skip From 6c9e9a619a85903d688ef2e05b4de43d86603bf6 Mon Sep 17 00:00:00 2001 From: Martin Staffa Date: Wed, 29 Nov 2017 15:45:19 +0100 Subject: [PATCH 2/2] Wording update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8aa06d3de434..6d59cf07affd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ notifications: jobs: include: - stage: deploy - # Don't deploy from PRs and only from our default branches, or if tag exists + # Don't deploy from PRs. Only deploy from our default branches, or if commit is tagged. # This is a Travis-specific boolean language: https://docs.travis-ci.com/user/conditional-builds-stages-jobs#Specifying-conditions # The deployment logic for pushed branches is further defined in scripts\travis\build.sh if: type != pull_request and (branch =~ ^(v1\.\d+\.x|master)$ or tag IS present)