Skip to content

Commit 809798b

Browse files
fattenederfatteneder
committed
also trigger build if PR gets merged
1 parent 5456f8e commit 809798b

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

‎pipelines/main/launch_unsigned_jobs.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ steps:
5555
- *pr-labels
5656
commands: |
5757
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
58-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
58+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
59+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
5960
### Launch Linux build jobs
6061
# Regular:
6162
GROUP="Build" \
@@ -112,7 +113,8 @@ steps:
112113
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/doctest.yml
113114
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/pdf_docs/build_pdf_docs.yml
114115
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
115-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
116+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
117+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
116118
if [[ $${BUILD} == 1 ]]; then
117119
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/analyzegc.yml
118120
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/embedding.yml
@@ -141,7 +143,8 @@ steps:
141143
commands: |
142144
export ALLOW_FAIL="false"
143145
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
144-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
146+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
147+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
145148
if [[ $${BUILD} == 1 ]]; then
146149
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/gcext.yml
147150
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/test_revise.yml
@@ -187,7 +190,8 @@ steps:
187190
commands: |
188191
export ALLOW_FAIL="true"
189192
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
190-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
193+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
194+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
191195
# Launch Linux allowed-to-fail build jobs
192196
GROUP="Allow Fail" \
193197
BUILD="$${BUILD}" \
@@ -223,7 +227,8 @@ steps:
223227
commands: |
224228
export ALLOW_FAIL="true"
225229
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
226-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
230+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
231+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
227232
if [[ $${BUILD} == 1 ]]; then
228233
### Launch Linux allowed-to-fail test jobs.
229234
# Regular:

‎pipelines/main/launch_upload_jobs.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ steps:
4343
export BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET
4444
export ALLOW_FAIL="false"
4545
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
46-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
46+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
47+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
4748
if [[ $${BUILD} == 1 ]]; then
4849
##### Launch `upload_*` jobs to store tarballs into S3 once tests are done
4950
### Linux:
@@ -106,7 +107,8 @@ steps:
106107
# Explicitly pass along the cryptic token to child pipelines
107108
export BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET
108109
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
109-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
110+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
111+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
110112
111113
export ALLOW_FAIL="true"
112114

‎pipelines/scheduled/launch_unsigned_jobs.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ steps:
4242
- *pr-labels
4343
commands: |
4444
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
45-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
45+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
46+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
4647
GROUP="Source Build" \
4748
ALLOW_FAIL="false" \
4849
BUILD="$${BUILD}" \
@@ -61,7 +62,8 @@ steps:
6162
repo_url: "https://github.com/JuliaCI/julia-buildkite"
6263
commands: |
6364
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
64-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
65+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
66+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
6567
if [[ $${BUILD} == 1 ]]; then
6668
GROUP="Source Tests (Allow Fail)" \
6769
ALLOW_FAIL="true" \
@@ -83,7 +85,8 @@ steps:
8385
- *pr-labels
8486
commands: |
8587
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
86-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
88+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
89+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
8790
GROUP="no_GPL" \
8891
ALLOW_FAIL="false" \
8992
BUILD="$${BUILD}" \

‎pipelines/scheduled/launch_upload_jobs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ steps:
3232
# Explicitly pass along the cryptic token to child pipelines
3333
export BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET
3434
FORCE=$(test -n "$(echo $${PULL_REQUEST_LABELS} | grep -E "\bci-force-build\b")" && echo 1 || echo 0)
35-
BUILD=$(($${TRIGGER_BUILD} || $${FORCE}))
35+
MERGED=$(test "$${BUILDKITE_PULL_REQUEST}" = "false" && echo 1 || echo 0)
36+
BUILD=$(($${TRIGGER_BUILD} || $${FORCE} || $${MERGED}))
3637
if [[ $${BUILD} == 1 ]]; then
3738
# Launch `upload_*` jobs to store tarballs into S3 once tests are done
3839
bash .buildkite/utilities/arches_pipeline_upload.sh \

0 commit comments

Comments
 (0)