From 8b69d91fffff840fc9eeb16a06707e7bf17f75e4 Mon Sep 17 00:00:00 2001
From: Martin Staffa <mjstaffa@googlemail.com>
Date: Wed, 29 Nov 2017 15:45:59 +0100
Subject: [PATCH] chore(travis): fix deployment condition to include tagged
 commits

Tagged commits are not considered to belong to any branch.

Closes #16346
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d86faa8ea81..6d59cf07aff 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. 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)$
+      if: type != pull_request and (branch =~ ^(v1\.\d+\.x|master)$ or tag IS present)
       env:
         - JOB=deploy
       before_script: skip