From 0df8f6bfe35f3a92516cf463516a67f5e8cff33e Mon Sep 17 00:00:00 2001
From: Amir Zarrinkafsh <nightah@me.com>
Date: Thu, 2 Jul 2020 16:56:45 +1000
Subject: [PATCH] [CI] Collect and upload coverage on master branch (#1174)

---
 .buildkite/hooks/post-command   | 2 +-
 .buildkite/pipeline.sh          | 4 ++--
 .buildkite/steps/buildimages.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index b93d09d0b..db076e261 100755
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -9,7 +9,7 @@ if [[ $BUILDKITE_PULL_REQUEST != "false" ]]; then
   fi
 fi
 
-if [[ ! $BUILDKITE_BRANCH =~ ^(master|v.*) ]] && [[ $BUILDKITE_COMMAND_EXIT_STATUS == 0 ]]; then
+if [[ ! $BUILDKITE_BRANCH =~ ^(v.*) ]] && [[ $BUILDKITE_COMMAND_EXIT_STATUS == 0 ]]; then
   if [[ $BUILDKITE_LABEL == ":hammer_and_wrench: Unit Test" ]]; then
     echo "--- :codecov: Upload coverage reports"
     bash <(curl -s --connect-timeout 10 --retry 10 --retry-max-time 0 https://codecov.io/bash) -Z -c -f "coverage.txt" -F backend
diff --git a/.buildkite/pipeline.sh b/.buildkite/pipeline.sh
index c5685435b..d39f951bd 100755
--- a/.buildkite/pipeline.sh
+++ b/.buildkite/pipeline.sh
@@ -48,11 +48,11 @@ steps:
     if: build.env("CI_BYPASS") != "true"
 
   - wait:
-    if: build.branch !~ /^(master)|(v[0-9]+\.[0-9]+\.[0-9]+)$\$/ && build.env("CI_BYPASS") != "true"
+    if: build.branch !~ /^(v[0-9]+\.[0-9]+\.[0-9]+)$\$/ && build.env("CI_BYPASS") != "true"
 
   - label: ":chrome: Integration Tests"
     command: ".buildkite/steps/e2etests.sh | buildkite-agent pipeline upload"
     depends_on:
       - "build-docker-linux-coverage"
-    if: build.branch !~ /^(master)|(v[0-9]+\.[0-9]+\.[0-9]+)$\$/ && build.env("CI_BYPASS") != "true"
+    if: build.branch !~ /^(v[0-9]+\.[0-9]+\.[0-9]+)$\$/ && build.env("CI_BYPASS") != "true"
 EOF
\ No newline at end of file
diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh
index e3efa59d5..8ad025f13 100755
--- a/.buildkite/steps/buildimages.sh
+++ b/.buildkite/steps/buildimages.sh
@@ -27,7 +27,7 @@ cat << EOF
 EOF
 if [[ "${BUILD_ARCH}" == "coverage" ]]; then
 cat << EOF
-    if: build.branch !~ /^(master)|(v[0-9]+\.[0-9]+\.[0-9]+)$\$/
+    if: build.branch !~ /^(v[0-9]+\.[0-9]+\.[0-9]+)$\$/
 EOF
 fi
   done