Skip to content

Commit 28b7b06

Browse files
KristofferCKristofferC
authored
Merge pull request #42255 from JuliaLang/backports-release-1.7
release-1.7: Backports for 1.7-rc2
2 parents 9eade61 + 12b9178 commit 28b7b06

File tree

189 files changed

+2919
-3371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+2919
-3371
lines changed

‎.buildkite/cryptic_repo_keys/.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Ignore the unencrypted repo_key
2+
repo_key
3+
4+
# Ignore any agent keys (public or private) we have stored
5+
agent_key*

‎.buildkite/pipelines/experimental/0_webui.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
agents:
55
queue: "julia"
66
sandbox.jl: "true"
7-
87
steps:
98
- label: ":unlock: Unlock secrets, launch pipelines"
109
plugins:
@@ -16,9 +15,8 @@ steps:
1615
# pipelines.
1716
unsigned_pipelines:
1817
- .buildkite/pipelines/experimental/launch_unsigned_builders.yml
19-
2018
# Our signed pipelines must have a `signature` or `signature_file` parameter that
2119
# verifies the treehash of the pipeline itself and the inputs listed in `inputs`
2220
# signed_pipelines:
2321
# - pipeline: .buildkite/pipelines/experimental/misc/foo_bar_baz.yml
24-
# signature: "my_signature"
22+
# signature_file: .buildkite/pipelines/experimental/misc/foo_bar_baz.yml.signature

‎.buildkite/pipelines/experimental/launch_unsigned_builders.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: ":buildkite: Launch unsigned pipelines"
33
commands: |
4-
buildkite-agent pipeline upload .buildkite/pipelines/experimental/misc/sanitizers.yml
4+
true
55
agents:
66
queue: julia

‎.buildkite/pipelines/main/0_webui.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
agents:
55
queue: "julia"
66
sandbox.jl: "true"
7-
87
steps:
98
- label: ":unlock: Unlock secrets, launch pipelines"
109
plugins:

‎.buildkite/pipelines/main/launch_unsigned_builders.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,21 @@
1313
# something about the privileged steps.
1414

1515
steps:
16-
- label: ":buildkite: Launch unsigned builders"
16+
- label: ":buildkite: Launch unsigned jobs"
1717
commands: |
18-
# First, we launch the `whitespace` builder, because we want that builder to finish as quickly as possible.
19-
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/whitespace.yml
20-
21-
# Next, we launch the miscellaneous builders in alphabetical order.
18+
# Launch the miscellaneous jobs in alphabetical order.
2219
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/doctest.yml
2320
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/embedding.yml
2421
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/llvmpasses.yml
22+
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/sanitizers.yml
2523
26-
# Finally, we launch the platform builders (`package_*`) and (`tester_*`) in alphabetical order.
27-
buildkite-agent pipeline upload .buildkite/pipelines/main/platforms/linux64.yml
24+
# Launch all of the platform jobs.
25+
bash .buildkite/utilities/platforms/platforms.sh .buildkite/pipelines/main/platforms/package_linux.arches .buildkite/pipelines/main/platforms/package_linux.yml
26+
bash .buildkite/utilities/platforms/platforms.sh .buildkite/pipelines/main/platforms/tester_linux.arches .buildkite/pipelines/main/platforms/tester_linux.yml
27+
28+
# Launch the `whitespace` job last. Uploading it last actually causes it to start
29+
# first. We want this job to start first because we want it to finish as quickly
30+
# as possible.
31+
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/whitespace.yml
2832
agents:
2933
queue: julia

‎.buildkite/pipelines/main/misc/doctest.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ agents:
33
# Only run on `sandbox.jl` machines (not `docker`-isolated ones) since we need nestable sandboxing
44
sandbox.jl: "true"
55
os: "linux"
6-
76
steps:
87
- label: "doctest"
98
key: doctest
109
plugins:
1110
- JuliaCI/julia#v1:
12-
version: 1.6
11+
# Drop default "registries" directory, so it is not persisted from execution to execution
12+
persist_depot_dirs: packages,artifacts,compiled
13+
version: '1.6'
1314
- staticfloat/sandbox#v1:
1415
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
1516
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
@@ -20,7 +21,7 @@ steps:
2021
- "/cache/repos:/cache/repos"
2122
commands: |
2223
echo "--- Build Julia from source"
23-
make -j 6
24+
make --output-sync -j 6
2425
2526
echo "--- Print Julia version info"
2627
./julia -e 'using InteractiveUtils; InteractiveUtils.versioninfo()'
@@ -31,6 +32,3 @@ steps:
3132
echo "--- Run Julia doctests"
3233
JULIA_NUM_THREADS=1 make -C doc doctest=true
3334
timeout_in_minutes: 45
34-
notify:
35-
- github_commit_status:
36-
context: "doctest"

‎.buildkite/pipelines/main/misc/embedding.yml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ agents:
33
# Only run on `sandbox.jl` machines (not `docker`-isolated ones) since we need nestable sandboxing
44
sandbox.jl: "true"
55
os: "linux"
6-
76
steps:
87
- label: "embedding"
98
key: "embedding"
109
plugins:
1110
- JuliaCI/julia#v1:
12-
version: 1.6
11+
# Drop default "registries" directory, so it is not persisted from execution to execution
12+
persist_depot_dirs: packages,artifacts,compiled
13+
version: '1.6'
1314
- staticfloat/sandbox#v1:
1415
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
1516
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
@@ -20,15 +21,11 @@ steps:
2021
- "/cache/repos:/cache/repos"
2122
commands: |
2223
prefix="/tmp/prefix"
23-
echo "+++ Build julia, deploy to $${prefix}"
24-
make -j$${JULIA_NUM_CORES} JULIA_PRECOMPILE=0 prefix=$${prefix} install
24+
echo "+++ Build julia, deploy to $${prefix:?}"
25+
make --output-sync -j$${JULIA_CPU_THREADS:?} JULIA_PRECOMPILE=0 prefix=$${prefix:?} install
2526
2627
embedding_output="/tmp/embedding-test"
27-
echo "+++ Run embedding tests, deploy to $${embedding_output}"
28-
mkdir -p "$${embedding_output}"
29-
make -j$${JULIA_NUM_CORES} -C test/embedding JULIA="$${prefix}/bin/julia" BIN="$${embedding_output}"
30-
28+
echo "+++ Run embedding tests, deploy to $${embedding_output:?}"
29+
mkdir -p "$${embedding_output:?}"
30+
make --output-sync -j$${JULIA_CPU_THREADS:?} -C test/embedding JULIA="$${prefix:?}/bin/julia" BIN="$${embedding_output:?}"
3131
timeout_in_minutes: 60
32-
notify:
33-
- github_commit_status:
34-
context: "embedding"

‎.buildkite/pipelines/main/misc/llvmpasses.yml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ agents:
33
# Only run on `sandbox.jl` machines (not `docker`-isolated ones) since we need nestable sandboxing
44
sandbox.jl: "true"
55
os: "linux"
6-
76
steps:
87
- label: "analyzegc"
98
key: "analyzegc"
109
plugins:
1110
- JuliaCI/julia#v1:
12-
version: 1.6
11+
# Drop default "registries" directory, so it is not persisted from execution to execution
12+
persist_depot_dirs: packages,artifacts,compiled
13+
version: '1.6'
1314
- staticfloat/sandbox#v1:
1415
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
1516
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
@@ -18,20 +19,18 @@ steps:
1819
- "/cache/repos:/cache/repos"
1920
commands: |
2021
echo "--- Install in-tree LLVM dependencies"
21-
make -j$${JULIA_NUM_CORES} -C deps install-llvm install-clang install-llvm-tools install-libuv install-utf8proc install-unwind
22+
make --output-sync -j$${JULIA_CPU_THREADS:?} -C deps install-llvm install-clang install-llvm-tools install-libuv install-utf8proc install-unwind
2223
echo "+++ run clangsa/analyzegc"
23-
make -j$${JULIA_NUM_CORES} -C test/clangsa
24-
make -j$${JULIA_NUM_CORES} -C src analyzegc
24+
make --output-sync -j$${JULIA_CPU_THREADS:?} -C test/clangsa
25+
make --output-sync -j$${JULIA_CPU_THREADS:?} -C src analyzegc
2526
timeout_in_minutes: 60
26-
notify:
27-
- github_commit_status:
28-
context: "analyzegc"
29-
3027
- label: "llvmpasses"
3128
key: "llvmpasses"
3229
plugins:
3330
- JuliaCI/julia#v1:
34-
version: 1.6
31+
# Drop default "registries" directory, so it is not persisted from execution to execution
32+
persist_depot_dirs: packages,artifacts,compiled
33+
version: '1.6'
3534
- staticfloat/sandbox#v1:
3635
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.8/package_linux.x86_64.tar.gz
3736
rootfs_treehash: "84a323ae8fcc724f8ea5aca5901bbbf4bda3e519"
@@ -41,12 +40,9 @@ steps:
4140
- "/cache/repos:/cache/repos"
4241
commands: |
4342
echo "--- make release"
44-
make -j$${JULIA_NUM_CORES} release JULIA_PRECOMPILE=0
43+
make --output-sync -j$${JULIA_CPU_THREADS:?} release JULIA_PRECOMPILE=0
4544
echo "--- make src/install-analysis-deps"
46-
make -j$${JULIA_NUM_CORES} -C src install-analysis-deps
45+
make --output-sync -j$${JULIA_CPU_THREADS:?} -C src install-analysis-deps
4746
echo "+++ make test/llvmpasses"
48-
make -j$${JULIA_NUM_CORES} -C test/llvmpasses
47+
make --output-sync -j$${JULIA_CPU_THREADS:?} -C test/llvmpasses
4948
timeout_in_minutes: 60
50-
notify:
51-
- github_commit_status:
52-
context: "llvmpasses"

‎.buildkite/pipelines/experimental/misc/sanitizers.yml‎ renamed to ‎.buildkite/pipelines/main/misc/sanitizers.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,25 @@ agents:
33
# Only run on `sandbox.jl` machines (not `docker`-isolated ones) since we need nestable sandboxing
44
sandbox.jl: "true"
55
os: "linux"
6-
76
steps:
87
- label: "asan"
9-
key: asan
8+
key: "asan"
109
plugins:
1110
- JuliaCI/julia#v1:
12-
version: 1.6
11+
# Drop default "registries" directory, so it is not persisted from execution to execution
12+
persist_depot_dirs: packages,artifacts,compiled
13+
version: '1.6'
1314
- staticfloat/sandbox#v1:
1415
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
1516
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
1617
uid: 1000
1718
gid: 1000
1819
workspaces:
1920
- "/cache/repos:/cache/repos"
20-
# `contrib/check-asan.jl` needs a `julia` binary:
21-
- JuliaCI/julia#v1:
22-
version: 1.6
21+
timeout_in_minutes: 120
22+
if: | # We only run the `asan` job on Julia 1.8 and later.
23+
(pipeline.slug != "julia-release-1-dot-6") && (pipeline.slug != "julia-release-1-dot-7")
24+
soft_fail: true # TODO: delete this line (and thus disallow failures) once JuliaLang/julia#42540 is fixed
2325
commands: |
2426
echo "--- Build julia-debug with ASAN"
25-
contrib/asan/build.sh ./tmp/test-asan -j$${JULIA_NUM_CORES} debug
26-
echo "--- Test that ASAN is enabled"
27-
contrib/asan/check.jl ./tmp/test-asan/asan/usr/bin/julia-debug
28-
timeout_in_minutes: 120
29-
# notify: # TODO: uncomment this line
30-
# - github_commit_status: # TODO: uncomment this line
31-
# context: "asan" # TODO: uncomment this line
27+
contrib/asan/build.sh ./tmp/test-asan -j$${JULIA_CPU_THREADS:?} debug

‎.buildkite/pipelines/main/misc/signed_pipeline_test.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ agents:
55
## pipeline that showcases decryption of environment variable
66
steps:
77
- label: ":lock: :rocket: Signed pipeline test"
8+
# We must accept the signed job id secret in order to propagate secrets
9+
env:
10+
BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET: ${BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET?}
11+
depends_on:
812
plugins:
913
- staticfloat/cryptic#v1:
1014
variables:
1115
- SECRET_KEY="U2FsdGVkX18tb7st0SuQAvh4Yv4xENxOAu8q9XkmOeDVKBNY4FngEwK3xmiKUqaS"
1216
commands: |
1317
echo "SECRET_KEY: $${SECRET_KEY}"
1418
15-
# We must accept the signed job id secret in order to propagate secrets
16-
env:
17-
BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET: ${BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET?}

0 commit comments

Comments
 (0)