Skip to content

Commit 53b4920

Browse files
authored
Merge branch 'main' into jn/cancel-signal
2 parents 3f8451c + 12936c2 commit 53b4920

File tree

5 files changed

+60
-5
lines changed

5 files changed

+60
-5
lines changed
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
1. Go to https://buildkite.com/julialang
2+
2. In the top-right-hand corner, click on the white "New Pipeline" button.
3+
3. You are now on a page that says "New Pipeline". Fill in the fields as follows:
4+
- Name: `julia-release-1.9`
5+
- Description: `https://github.com/JuliaLang/julia`
6+
- Git Repository:
7+
- Step i. Click on the dropdown that says "Any account", and click on `JuliaLang`.
8+
- Step ii: Click on the text field that says "[email protected]:your/repo.git", and from the dropdown menu that appears, click on `JuliaLang/julia`.
9+
- Step iii: Next to "Checkout using", click on the radio button for `HTTPS`. Once you do that, the URL should automatically change to `https://github.com/JuliaLang/julia.git`
10+
- Auto-create webhooks: make sure that this checkbox IS checked.
11+
- Teams: select the following two teams:
12+
- `[ALL USERS] Base Julia CI (build and read)`
13+
- `Base Julia CI (Slack notifications)`
14+
4. At the bottom of the page, click on the green "Create Pipeline" button.
15+
5. Go to https://buildkite.com/julialang/julia-release-1-dot-9 and click on the white "Edit steps" button.
16+
6. Delete ALL text in the text box.
17+
7. Into the text box, paste the exact contents from the folllowing file: https://github.com/JuliaCI/julia-buildkite/blob/main/pipelines/main/0_webui.yml
18+
8. Click on the white "Save Steps" button.
19+
9. Go to https://buildkite.com/julialang/julia-release-1-dot-9 and click on the white "Pipeline Settings" (or just "Settings") button in the top-right-hand corner.
20+
10. In the left-hand side, under "Pipeline Settings", click on "General". Then, scroll down to the bottom of the page. In the "Pipeline Management" section, click on the white "Make Pipeline Public" button. If you are asked for confirmation, click on the green "Make Pipeline Public" button to confirm your decision.
21+
11. Go to https://buildkite.com/julialang/julia-release-1-dot-9 and click on the white "Pipeline Settings" (or just "Settings") button in the top-right-hand corner.
22+
12. In the left-hand side, under "Pipeline Settings", click on "Builds". Then, in the "Build Skipping" section, do the following actions:
23+
- Step i: Make sure that the "Skip Intermediate Builds" checkbox IS checked.
24+
- Step ii: Make sure that the "Cancel Intermediate Builds" checkbox IS checked.
25+
- Step iii: Under "Skip Intermediate Builds", in the text box, enter the following text: `!master !main !release-*`
26+
- Step iv: Under "Cancel Intermediate Builds", in the text box, enter the following text: `!master !main !release-*`
27+
- Step v: Click on the green "Save Build Skipping" button.
28+
13. Go to https://buildkite.com/julialang/julia-release-1-dot-9 and click on the white "Pipeline Settings" (or just "Settings") button in the top-right-hand corner.
29+
14. In the left-hand side, under "Pipeline Settings", click on "GitHub". Then, in the "Branch Limiting" section, do the following actions:
30+
- Step i: For "Branch Filter Pattern", enter the following text: `release-1.9 v1.9.*`
31+
- Step ii: Click on the green "Save Branch Limiting" button.
32+
15. You are still on the "Pipeline Settings ⟶ GitHub" page. In the "GitHub Settings" section, do the following actions:
33+
- Step i: Make sure that the radio button for "Trigger builds after pushing code" IS selected.
34+
- Step ii: Make sure that the checkbox for "Filter after pushing code" IS selected.
35+
- Step iii: Under "Filter builds using a conditional", enter the following text: `(build.pull_request.base_branch == null) || (build.pull_request.base_branch == "release-1.9") || (build.pull_request.base_branch == "backports-release-1.9")`
36+
- Step iv: Make sure that the checkbox for "Build Pull Requests" IS selected.
37+
- Step v: Under "Build Pull Requests", make sure that the checkbox for "Build pull requests from third-party forked repositories" IS selected.
38+
- **Step vi: Under "Build pull requests from third-party forked repositories", make sure that the checkbox for "Prefix third-party fork branch names" IS selected. It's important to make sure you complete this step.**
39+
- Step vii: Make sure that the checkbox for "Build tags" IS selected.
40+
- Step viii: Make sure that the checkbox for "Cancel deleted branch builds" IS selected.
41+
- Step ix: Make sure that the checkbox for "Update commit statuses" IS selected.
42+
- Step x: Under "Update commit statuses", for "Show blocked builds in GitHub as", from the drop-down menu, select "Pending".
43+
- Step xi: Make sure that the checkbox for "Create a status for each job" is NOT selected.
44+
- Step xii: Make sure that the checkbox for "Separate statuses for pull requests" is NOT selected.
45+
- Step xiii: At the bottom of the page, click on the green "Save GitHub Settings" button.
46+
16. Go to https://buildkite.com/julialang/julia-release-1-dot-9 and click on the white "Pipeline Settings" button.
47+
17. In the left-hand side, under "Pipeline Settings", click on "Teams". Then do the following actions:
48+
- Step i: Next to "Base Julia CI (Slack notifications)", click on the text `Full Access` and change it to `Read Only`.
49+
- Step ii: Next to "[ALL USERS] Base Julia CI (build & read)", click on the text `Full Access` and change it to `Build & Read`.

pipelines/main/launch_unsigned_jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
# Yes, this is creating another layer of indirection; the flow now looks like:
66
#
7-
# [webui] -> launch_unsigned_builders.yml -> misc/whitespace.yml
7+
# [webui] -> launch_unsigned_builders.yml -> misc/llvmpasses.yml
88
#
9-
# when we could theoretically just have the `webui` launch `misc/whitespace.yml`,
9+
# when we could theoretically just have the `webui` launch `misc/llvmpasses.yml`,
1010
# however this raises the bar for contributors to add new (unsigned) steps to
1111
# our CI configuration, so I'd rather live with an extra layer of indirection
1212
# and only need to touch the webui configuration when we need to alter
@@ -65,7 +65,7 @@ steps:
6565
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/pdf_docs/build_pdf_docs.yml
6666
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/embedding.yml
6767
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/llvmpasses.yml
68-
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/whitespace.yml
68+
# buildkite-agent pipeline upload .buildkite/pipelines/main/misc/whitespace.yml # Currently runs in GitHub Actions instead of Buildkite
6969
7070
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/sanitizers/asan.yml
7171
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/sanitizers/tsan.yml

pipelines/main/platforms/build_linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ steps:
3636
# Receive some environment mappings from our templating engine
3737
TRIPLET: "${TRIPLET?}"
3838
MAKE_FLAGS: "${MAKE_FLAGS?}"
39+
ROOTFS_IMAGE_NAME: "${ROOTFS_IMAGE_NAME?}"
3940
BUILDKITE_CANCEL_SIGNAL: "SIGQUIT"

pipelines/scheduled/launch_unsigned_jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
# Yes, this is creating another layer of indirection; the flow now looks like:
66
#
7-
# [webui] -> launch_unsigned_builders.yml -> misc/whitespace.yml
7+
# [webui] -> launch_unsigned_builders.yml -> misc/llvmpasses.yml
88
#
9-
# when we could theoretically just have the `webui` launch `misc/whitespace.yml`,
9+
# when we could theoretically just have the `webui` launch `misc/llvmpasses.yml`,
1010
# however this raises the bar for contributors to add new (unsigned) steps to
1111
# our CI configuration, so I'd rather live with an extra layer of indirection
1212
# and only need to touch the webui configuration when we need to alter

utilities/build_julia.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ ld -v
1919
echo
2020
buildkite-agent --version
2121

22+
if [[ "${ROOTFS_IMAGE_NAME-}" == "llvm_passes" ]]; then
23+
echo "--- Update CMake"
24+
contrib/download_cmake.sh
25+
fi
26+
2227
echo "--- Collect make options"
2328
# These are the flags we'll provide to `make`
2429
MFLAGS=()

0 commit comments

Comments
 (0)