Skip to content

Commit dc2f781

Browse files
authored
Merge pull request #42765 from JuliaLang/backports-release-1.7
release-1.7: Backports for 1.7.0/1.7.0-rc3
2 parents f23fc0d + 5da2e44 commit dc2f781

File tree

146 files changed

+2386
-1321
lines changed

Some content is hidden

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

146 files changed

+2386
-1321
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
16-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
16+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
1717
uid: 1000
1818
gid: 1000
1919
workspaces:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
16-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
16+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
1717
uid: 1000
1818
gid: 1000
1919
workspaces:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
16-
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/llvm_passes.x86_64.tar.gz
16+
rootfs_treehash: "c7a289a8cc544b234b1e2d7cbcce3e6815359ecd"
1717
workspaces:
1818
# Include `/cache/repos` so that our `git` version introspection works.
1919
- "/cache/repos:/cache/repos"
@@ -32,8 +32,8 @@ steps:
3232
persist_depot_dirs: packages,artifacts,compiled
3333
version: '1.6'
3434
- staticfloat/sandbox#v1:
35-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.8/package_linux.x86_64.tar.gz
36-
rootfs_treehash: "84a323ae8fcc724f8ea5aca5901bbbf4bda3e519"
35+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
36+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
3737
uid: 1000
3838
gid: 1000
3939
workspaces:

.buildkite/pipelines/main/misc/sanitizers.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
16-
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/llvm_passes.x86_64.tar.gz
16+
rootfs_treehash: "c7a289a8cc544b234b1e2d7cbcce3e6815359ecd"
1717
uid: 1000
1818
gid: 1000
1919
workspaces:
@@ -25,3 +25,23 @@ steps:
2525
commands: |
2626
echo "--- Build julia-debug with ASAN"
2727
contrib/asan/build.sh ./tmp/test-asan -j$${JULIA_CPU_THREADS:?} debug
28+
- label: "tsan"
29+
key: "tsan"
30+
plugins:
31+
- JuliaCI/julia#v1:
32+
# Drop default "registries" directory, so it is not persisted from execution to execution
33+
persist_depot_dirs: packages,artifacts,compiled
34+
version: '1.6'
35+
- staticfloat/sandbox#v1:
36+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/llvm_passes.x86_64.tar.gz
37+
rootfs_treehash: "c7a289a8cc544b234b1e2d7cbcce3e6815359ecd"
38+
uid: 1000
39+
gid: 1000
40+
workspaces:
41+
- "/cache/repos:/cache/repos"
42+
timeout_in_minutes: 120
43+
if: | # We only run the `tsan` job on Julia 1.8 and later.
44+
(pipeline.slug != "julia-release-1-dot-6") && (pipeline.slug != "julia-release-1-dot-7")
45+
commands: |
46+
echo "--- Build julia-debug runtime with TSAN"
47+
contrib/tsan/build.sh ./tmp/test-tsan -j$${JULIA_CPU_THREADS:?} julia-src-debug
Binary file not shown.

.buildkite/pipelines/main/misc/whitespace.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
16-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
16+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
1717
workspaces:
1818
- "/cache/repos:/cache/repos"
1919
timeout_in_minutes: 10
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
# linux _aarch64 false _aarch64 aarch64 none 60 no no no v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3-
# linux _armv7l false _armv7l armv7l none 60 no no no v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4-
linux 32 false 32 i686 none 60 no no no v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5-
# linux _ppc64le false _ppc64le powerpc64le none 60 no no no v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6-
linux 64 false 64 x86_64 none 60 no no no v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7-
musl 64 false 64 x86_64 none 60 no no no v3.19 e6a2730e37c386c46915b2650d6aaaa398195152
1+
# PLATFORM LABEL GROUP ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2+
linux 32 . . 32 i686 . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
3+
linux 64 . . 64 x86_64 . . . . . . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
4+
# linux aarch64 . . aarch64 aarch64 . . . . . . . .... ........................................
5+
# linux armv7l . . armv7l armv7l . . . . . . . .... ........................................
6+
# linux ppc64le . . ppc64le powerpc64le . . . . . . . .... ........................................
7+
musl 64 . . 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90

.buildkite/pipelines/main/platforms/package_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
workspaces:
2020
# Include `/cache/repos` so that our `git` version introspection works.
2121
- "/cache/repos:/cache/repos"
22-
timeout_in_minutes: ${TIMEOUT?}
22+
timeout_in_minutes: ${TIMEOUT_BK?}
2323
commands: |
2424
echo "--- Print the full and short commit hashes"
2525
SHORT_COMMIT_LENGTH=10
Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
1-
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
# linux _aarch64 false _aarch64 aarch64 none 60 no no no v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3-
# linux _armv7l false _armv7l armv7l none 60 no no no v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4-
linux 32 false 32 i686 none 60 no no no v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5-
# linux _ppc64le false _ppc64le powerpc64le none 60 no no no v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6-
linux 64_rr false 64 x86_64 none 60 yes no no v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7-
linux 64_st false 64 x86_64 none 60 no yes no v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
8-
linux 64_mt false 64 x86_64 none 60 no no yes v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
9-
musl 64 true 64 x86_64 none 60 no no no v3.19 e6a2730e37c386c46915b2650d6aaaa398195152
1+
# PLATFORM LABEL GROUP ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2+
linux 32_g1 g1 . 32 i686 . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
3+
linux 32_g2 g2 . 32 i686 . . . 3 . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
4+
5+
linux 64_g1_mt g1 . 64 x86_64 . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
6+
linux 64_g2_mt g2 . 64 x86_64 . . . 3 . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
7+
8+
linux 64_g1_st g1 . 64 x86_64 . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
9+
linux 64_g2_st g2 . 64 x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
10+
11+
linux 64_g1_rrst g1 . 64 x86_64 . 300 240 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
12+
linux 64_g2_rrst g2 . 64 x86_64 . 180 120 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
13+
linux 64_g3_st g3 . 64 x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
14+
15+
# linux aarch64_g1 g1 true aarch64 aarch64 . . . . . . . ---- ----------------------------------------
16+
# linux aarch64_g2 g2 true aarch64 aarch64 . . . . . . . ---- ----------------------------------------
17+
18+
# linux armv7l_g1 g1 true armv7l armv7l . . . . . . . ---- ----------------------------------------
19+
# linux armv7l_g2 g2 true armv7l armv7l . . . . . . . ---- ----------------------------------------
20+
21+
# linux ppc64le_g1 g1 true ppc64le powerpc64le . . . . . . . ---- ----------------------------------------
22+
# linux ppc64le_g2 g2 true ppc64le powerpc64le . . . . . . . ---- ----------------------------------------
23+
24+
musl 64_g1 g1 true 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90
25+
musl 64_g2 g2 true 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90

.buildkite/pipelines/main/platforms/tester_linux.yml

Lines changed: 52 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ steps:
2323
- "/cache/repos:/cache/repos"
2424
env:
2525
JULIA_SHELL: "/bin/bash"
26-
timeout_in_minutes: ${TIMEOUT?}
26+
timeout_in_minutes: ${TIMEOUT_BK?}
27+
retry:
28+
automatic:
29+
- exit_status: "*"
30+
limit: ${RETRIES?}
2731
soft_fail: ${ALLOW_FAIL?}
2832
commands: |
2933
echo "--- Print the full and short commit hashes"
@@ -52,48 +56,65 @@ steps:
5256
echo "JULIA_CPU_THREADS is: $${JULIA_CPU_THREADS:?}"
5357
$${JULIA_BINARY:?} -e '@info "" Sys.CPU_THREADS'
5458
55-
echo "--- Set some environment variables in preparation for running the Julia test suite"
56-
unset JULIA_DEPOT_PATH
59+
echo "--- Set some environment variables"
5760
export OPENBLAS_NUM_THREADS=8
58-
export TESTS="[\"all\"]"
61+
unset JULIA_DEPOT_PATH
62+
unset JULIA_PKG_SERVER
5963
60-
if [[ "${IS_RR?}" == "yes" ]]; then
61-
export JULIA_BINARY_UNDER_RR="$${JULIA_BINARY:?} .buildkite/utilities/rr/rr_capture.jl $${JULIA_BINARY:?}"
64+
# Make sure that temp files and temp directories are created in a location that is
65+
# backed by real storage.
66+
export TMPDIR="$(pwd)/tmp"
67+
mkdir -p $${TMPDIR:?}
6268
63-
export JULIA_BINARY_FOR_TESTS="$${JULIA_BINARY_UNDER_RR:?}"
64-
export NCORES_FOR_TESTS="parse(Int, ENV[\"JULIA_RRCAPTURE_NUM_CORES\"])"
69+
export NETWORK_RELATED_TESTS="Artifacts Downloads download LazyArtifacts LibGit2/online Pkg"
6570
66-
# For the `rr` job, we disable multi-threading.
67-
export JULIA_NUM_THREADS=1
71+
if [[ "${GROUP?}" == "all" ]]; then
72+
export TESTS="all LibGit2/online --force-net"
73+
elif [[ "${GROUP?}" == "all_except_pkg" ]]; then
74+
export TESTS="all LibGit2/online --force-net --skip Pkg"
75+
elif [[ "${GROUP?}" == "g1" ]]; then
76+
# Group 1: ALL tests EXCEPT the network-related tests.
77+
export TESTS="all --force-net --skip $${NETWORK_RELATED_TESTS:?}"
78+
elif [[ "${GROUP?}" == "g2" ]]; then
79+
# Group 2: ONLY the network-related tests.
80+
# In Group 2, we use whatever the default setting is with regards to the Pkg server.
81+
export TESTS="$${NETWORK_RELATED_TESTS:?} --force-net"
82+
elif [[ "${GROUP?}" == "g3" ]]; then
83+
# Group 3: only Pkg.
84+
# In Group 3, we explicitly opt-out of the Pkg server.
85+
# The purpose of group 3 is to test the non-Pkg-server codepaths of Pkg.
86+
export TESTS="Pkg --force-net"
87+
export JULIA_PKG_SERVER=""
88+
else
89+
echo "Invalid value for GROUP: ${GROUP?}"
90+
exit 1
91+
fi
92+
93+
export JULIA_TEST_RR_TIMEOUT="${TIMEOUT_RR?}"
94+
95+
if [[ "${IS_RR?}" == "yes" ]]; then
96+
export JULIA_CMD_FOR_TESTS="$${JULIA_BINARY:?} .buildkite/utilities/rr/rr_capture.jl $${JULIA_BINARY:?}"
97+
export NCORES_FOR_TESTS="parse(Int, ENV[\"JULIA_RRCAPTURE_NUM_CORES\"])"
6898
else
69-
export JULIA_BINARY_FOR_TESTS="$${JULIA_BINARY:?}"
99+
export JULIA_CMD_FOR_TESTS="$${JULIA_BINARY:?}"
70100
export NCORES_FOR_TESTS="Sys.CPU_THREADS"
101+
fi
71102
72-
if [[ "${IS_ST?}" == "yes" ]]; then
73-
# "ST" = single-threaded
74-
export JULIA_NUM_THREADS=1
75-
elif [[ "${IS_MT?}" == "yes" ]]; then
76-
# "MT" = multi-threaded
77-
export JULIA_NUM_THREADS=16
103+
if [[ "${IS_ST?}" == "yes" ]]; then
104+
export JULIA_NUM_THREADS=1
105+
fi
78106
79-
if [[ "$${BUILDKITE_PIPELINE_SLUG:?}" == "julia-release-1-dot-6" ]]; then
80-
# On Julia 1.6, we skip the Distributed test suite if multithreading is enabled.
81-
export TESTS="[\"all\", \"--skip\", \"Distributed\"]"
82-
elif [[ "$${BUILDKITE_PIPELINE_SLUG:?}" == "julia-release-1-dot-7" ]]; then
83-
# On Julia 1.7, we skip the Distributed test suite if multithreading is enabled.
84-
export TESTS="[\"all\", \"--skip\", \"Distributed\"]"
85-
else
86-
# On Julia 1.8 and later, we do not skip any test suites.
87-
export TESTS="[\"all\"]"
88-
fi
89-
fi
107+
if [[ "${IS_MT?}" == "yes" ]]; then
108+
export JULIA_NUM_THREADS=16
90109
fi
91110
92-
echo "JULIA_BINARY_FOR_TESTS is: $${JULIA_BINARY_FOR_TESTS:?}"
93-
echo "JULIA_NUM_THREADS is: $${JULIA_NUM_THREADS}" # this variable might not be set
111+
echo "--- Print the test group, list of test sets, and other useful environment variables"
112+
echo "JULIA_CMD_FOR_TESTS is: $${JULIA_CMD_FOR_TESTS:?}"
113+
echo "JULIA_NUM_THREADS is: $${JULIA_NUM_THREADS}" # Note: this environment variable might not be set
94114
echo "NCORES_FOR_TESTS is: $${NCORES_FOR_TESTS:?}"
95115
echo "OPENBLAS_NUM_THREADS is: $${OPENBLAS_NUM_THREADS:?}"
116+
echo "GROUP is: ${GROUP?}"
96117
echo "TESTS is: $${TESTS:?}"
97118
98119
echo "--- Run the Julia test suite"
99-
$${JULIA_BINARY_FOR_TESTS:?} -e "Base.runtests($${TESTS:?}; ncores = $${NCORES_FOR_TESTS:?})"
120+
$${JULIA_CMD_FOR_TESTS:?} -e "Base.runtests(\"$${TESTS:?}\"; ncores = $${NCORES_FOR_TESTS:?})"

.buildkite/pipelines/scheduled/coverage/coverage_linux64.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ steps:
1919
persist_depot_dirs: packages,artifacts,compiled
2020
version: '1.6'
2121
- staticfloat/sandbox#v1:
22-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
23-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
22+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
23+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
2424
uid: 1000
2525
gid: 1000
26+
timeout_in_minutes: 360 # 360 minutes = 6 hours
2627
commands: |
2728
echo "--- Build Julia from source"
2829
make --output-sync -j 6
@@ -41,5 +42,3 @@ steps:
4142
4243
echo "--- Process and upload coverage information"
4344
./julia .buildkite/pipelines/scheduled/coverage/upload_coverage.jl
44-
timeout_in_minutes: 240 # 240 minutes = 4 hours
45-

.buildkite/pipelines/scheduled/coverage/coverage_linux64.yml.signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Salted__��@P=j���R���U(�,~�p @Q������'h7����O MJ���g���t<�A�(�v?ɴ<,:�j���Y'o��ڥσdٛ
1+
Salted__�I�y�֌��>y�NckB�v�n�+�Hvrލ��Ƽ�r����/�uY�����u����I�iiE��(��v�L��!��?��v�
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
linux 64_no_bb false 64_no_bb x86_64 USE_BINARYBUILDER=0 240 no no no v4.4 ec3873fc1756ecb4c815e8785e9ca45cf54c68b6
1+
# PLATFORM LABEL GROUP ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2+
linux 64src . . 64src x86_64 USE_BINARYBUILDER=0 180 . . . . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a

0 commit comments

Comments
 (0)