ci(gcb): triggers will work on all branches we care about (#6255)

devjgm · web-flow · commit a6fa126f5438 · 2021-04-14T16:53:07.000-04:00
diff --git a/ci/cloudbuild/trigger.sh b/ci/cloudbuild/trigger.sh
@@ -50,7 +50,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\\d+\\..*)$
 name: ${name}-ci
 substitutions:
   _BUILD_NAME: ${name}
@@ -68,7 +68,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\\d+\\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: ${name}-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/asan-ci.yaml b/ci/cloudbuild/triggers/asan-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: asan-ci
 substitutions:
   _BUILD_NAME: asan
diff --git a/ci/cloudbuild/triggers/asan-pr.yaml b/ci/cloudbuild/triggers/asan-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: asan-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/bazel-clang-ci.yaml b/ci/cloudbuild/triggers/bazel-clang-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: bazel-clang-ci
 substitutions:
   _BUILD_NAME: bazel-clang
diff --git a/ci/cloudbuild/triggers/bazel-clang-pr.yaml b/ci/cloudbuild/triggers/bazel-clang-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: bazel-clang-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/bazel-gcc-ci.yaml b/ci/cloudbuild/triggers/bazel-gcc-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: bazel-gcc-ci
 substitutions:
   _BUILD_NAME: bazel-gcc
diff --git a/ci/cloudbuild/triggers/bazel-gcc-pr.yaml b/ci/cloudbuild/triggers/bazel-gcc-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: bazel-gcc-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/checkers-ci.yaml b/ci/cloudbuild/triggers/checkers-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: checkers-ci
 substitutions:
   _BUILD_NAME: checkers
diff --git a/ci/cloudbuild/triggers/checkers-pr.yaml b/ci/cloudbuild/triggers/checkers-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: checkers-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/clang-38-ci.yaml b/ci/cloudbuild/triggers/clang-38-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: clang-38-ci
 substitutions:
   _BUILD_NAME: clang-38
diff --git a/ci/cloudbuild/triggers/clang-38-pr.yaml b/ci/cloudbuild/triggers/clang-38-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: clang-38-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/clang-tidy-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: clang-tidy-ci
 substitutions:
   _BUILD_NAME: clang-tidy
diff --git a/ci/cloudbuild/triggers/clang-tidy-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: clang-tidy-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/cmake-clang-ci.yaml b/ci/cloudbuild/triggers/cmake-clang-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: cmake-clang-ci
 substitutions:
   _BUILD_NAME: cmake-clang
diff --git a/ci/cloudbuild/triggers/cmake-clang-pr.yaml b/ci/cloudbuild/triggers/cmake-clang-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: cmake-clang-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/cmake-gcc-ci.yaml b/ci/cloudbuild/triggers/cmake-gcc-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: cmake-gcc-ci
 substitutions:
   _BUILD_NAME: cmake-gcc
diff --git a/ci/cloudbuild/triggers/cmake-gcc-pr.yaml b/ci/cloudbuild/triggers/cmake-gcc-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: cmake-gcc-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/cmake-install-ci.yaml b/ci/cloudbuild/triggers/cmake-install-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: cmake-install-ci
 substitutions:
   _BUILD_NAME: cmake-install
diff --git a/ci/cloudbuild/triggers/cmake-install-pr.yaml b/ci/cloudbuild/triggers/cmake-install-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: cmake-install-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/cmake-super-ci.yaml b/ci/cloudbuild/triggers/cmake-super-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: cmake-super-ci
 substitutions:
   _BUILD_NAME: cmake-super
diff --git a/ci/cloudbuild/triggers/cmake-super-pr.yaml b/ci/cloudbuild/triggers/cmake-super-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: cmake-super-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/cxx17-ci.yaml b/ci/cloudbuild/triggers/cxx17-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: cxx17-ci
 substitutions:
   _BUILD_NAME: cxx17
diff --git a/ci/cloudbuild/triggers/cxx17-pr.yaml b/ci/cloudbuild/triggers/cxx17-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: cxx17-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-centos-7-ci.yaml b/ci/cloudbuild/triggers/demo-centos-7-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-centos-7-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-centos-7-pr.yaml b/ci/cloudbuild/triggers/demo-centos-7-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-centos-7-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-centos-8-ci.yaml b/ci/cloudbuild/triggers/demo-centos-8-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-centos-8-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-centos-8-pr.yaml b/ci/cloudbuild/triggers/demo-centos-8-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-centos-8-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-debian-buster-ci.yaml b/ci/cloudbuild/triggers/demo-debian-buster-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-debian-buster-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-debian-buster-pr.yaml b/ci/cloudbuild/triggers/demo-debian-buster-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-debian-buster-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-debian-stretch-ci.yaml b/ci/cloudbuild/triggers/demo-debian-stretch-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-debian-stretch-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-debian-stretch-pr.yaml b/ci/cloudbuild/triggers/demo-debian-stretch-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-debian-stretch-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-fedora-ci.yaml b/ci/cloudbuild/triggers/demo-fedora-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-fedora-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-fedora-pr.yaml b/ci/cloudbuild/triggers/demo-fedora-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-fedora-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml b/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-opensuse-leap-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml b/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-opensuse-leap-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-bionic-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-bionic-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-ubuntu-bionic-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-bionic-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-bionic-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-ubuntu-bionic-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-ubuntu-focal-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-ubuntu-focal-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-xenial-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-xenial-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: demo-ubuntu-xenial-ci
 substitutions:
   _BUILD_NAME: demo-install
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-xenial-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-xenial-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: demo-ubuntu-xenial-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/gcc-54-ci.yaml b/ci/cloudbuild/triggers/gcc-54-ci.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
 name: gcc-54-ci
 substitutions:
   _BUILD_NAME: gcc-54
diff --git a/ci/cloudbuild/triggers/gcc-54-pr.yaml b/ci/cloudbuild/triggers/gcc-54-pr.yaml
@@ -3,7 +3,7 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^master$
+    branch: ^(master|main|v\d+\..*)$
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 name: gcc-54-pr
 substitutions:
diff --git a/ci/cloudbuild/triggers/integration-ci.yaml b/ci/cloudbuild/triggers/integration-ci.yaml
diff --git a/ci/cloudbuild/triggers/integration-pr.yaml b/ci/cloudbuild/triggers/integration-pr.yaml
diff --git a/ci/cloudbuild/triggers/libcxx-ci.yaml b/ci/cloudbuild/triggers/libcxx-ci.yaml
diff --git a/ci/cloudbuild/triggers/libcxx-pr.yaml b/ci/cloudbuild/triggers/libcxx-pr.yaml
diff --git a/ci/cloudbuild/triggers/noex-ci.yaml b/ci/cloudbuild/triggers/noex-ci.yaml
diff --git a/ci/cloudbuild/triggers/noex-pr.yaml b/ci/cloudbuild/triggers/noex-pr.yaml
diff --git a/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml b/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml
diff --git a/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml b/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml
diff --git a/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml b/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml
diff --git a/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml b/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml
diff --git a/ci/cloudbuild/triggers/tsan-ci.yaml b/ci/cloudbuild/triggers/tsan-ci.yaml
diff --git a/ci/cloudbuild/triggers/tsan-pr.yaml b/ci/cloudbuild/triggers/tsan-pr.yaml
diff --git a/ci/cloudbuild/triggers/ubsan-ci.yaml b/ci/cloudbuild/triggers/ubsan-ci.yaml
diff --git a/ci/cloudbuild/triggers/ubsan-pr.yaml b/ci/cloudbuild/triggers/ubsan-pr.yaml
diff --git a/ci/cloudbuild/triggers/xsan-ci.yaml b/ci/cloudbuild/triggers/xsan-ci.yaml
diff --git a/ci/cloudbuild/triggers/xsan-pr.yaml b/ci/cloudbuild/triggers/xsan-pr.yaml
