Merge branch 'next' into master

bugsnag · Feb 1, 2022 · 4b7dad9 · 4b7dad9
2 parents da43423 + 83102a3
commit 4b7dad9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.buildkite/pipeline_trigger.sh b/.buildkite/pipeline_trigger.sh
@@ -12,6 +12,7 @@ if [[ "$BUILDKITE_MESSAGE" == *"[barebones ci]"* ]]; then
 elif [[ "$BUILDKITE_MESSAGE" == *"[full ci]"* ||
   "$BUILDKITE_BRANCH" == "next" ||
   "$BUILDKITE_BRANCH" == "master" ||
+  "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "master" ||
   ! -z "$FULL_SCHEDULED_BUILD" ]]; then
   echo "Running full build"
   echo "Unit and static tests will be run"
@@ -20,8 +21,7 @@ elif [[ "$BUILDKITE_MESSAGE" == *"[full ci]"* ||
   # Add files in reverse as BK insert them in place - leading to them reversing in the resulting pipeline
   buildkite-agent pipeline upload .buildkite/pipeline.full.yml
 elif [[ "$BUILDKITE_MESSAGE" == *"[gated-full ci]"* ||
-  "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "next" ||
-  "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "master" ]]; then
+  "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "next" ]]; then
   echo "Running gated-full build"
   echo "Unit and static tests will be run"
   echo "Minimal instrumentation tests will be run by default"