Skip to content

Commit a4697f4

Browse files
DilumAluthgeLilithHafner
DilumAluthge
authored and
LilithHafner
committed
CI (Buildkite): add package_musl64 and tester_musl64 (Linux, musl libc, 64-bit, x86_64 architecture) (JuliaLang#42476)
1 parent 77048e0 commit a4697f4

File tree

6 files changed

+54
-41
lines changed

6 files changed

+54
-41
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +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-
# Launch the `whitespace` builder first, because we want that builder to finish as quickly as possible.
19-
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/whitespace.yml
20-
21-
# 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
2522
buildkite-agent pipeline upload .buildkite/pipelines/main/misc/sanitizers.yml
2623
27-
# Launch all of the platform builders.
24+
# Launch all of the platform jobs.
2825
bash .buildkite/pipelines/main/platforms/platforms.sh package_linux
2926
bash .buildkite/pipelines/main/platforms/platforms.sh tester_linux
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
3032
agents:
3133
queue: julia

‎.buildkite/pipelines/main/platforms/package_linux.arches‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# ARCH ARCH_LABEL ROOTFS_ARCH TIMEOUT ROOTFS_TAG ROOTFS_TREE
2-
# aarch64 aarch64 aarch64 60 v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3-
# armv7l armv7l armv7l 60 v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4-
32 32 i686 60 v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5-
# ppc64le ppc64le powerpc64le 60 v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6-
64 64 x86_64 60 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
1+
# PLATFORM ARCH ARCH_LABEL ROOTFS_ARCH ALLOW_FAIL TIMEOUT ROOTFS_TAG ROOTFS_TREE
2+
# linux aarch64 aarch64 aarch64 false 60 v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3+
# linux armv7l armv7l armv7l false 60 v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4+
linux 32 32 i686 false 60 v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5+
# linux ppc64le ppc64le powerpc64le false 60 v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6+
linux 64 64 x86_64 false 60 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7+
musl 64 64 x86_64 false 60 v3.19 e6a2730e37c386c46915b2650d6aaaa398195152

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ agents:
44
sandbox.jl: "true"
55
os: "linux"
66
steps:
7-
- label: "package_linux${ARCH_LABEL?}"
8-
key: package_linux${ARCH_LABEL?}
7+
- label: "package_${PLATFORM?}${ARCH_LABEL?}"
8+
key: package_${PLATFORM?}${ARCH_LABEL?}
99
plugins:
1010
- JuliaCI/julia#v1:
1111
# Drop default "registries" directory, so it is not persisted from execution to execution
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/${ROOTFS_TAG?}/package_linux.${ROOTFS_ARCH?}.tar.gz
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/${ROOTFS_TAG?}/package_${PLATFORM?}.${ROOTFS_ARCH?}.tar.gz
1616
rootfs_treehash: "${ROOTFS_TREE?}"
1717
uid: 1000
1818
gid: 1000
@@ -24,9 +24,11 @@ steps:
2424
echo "--- Print the full and short commit hashes"
2525
SHORT_COMMIT_LENGTH=10
2626
SHORT_COMMIT=`echo $${BUILDKITE_COMMIT:?} | cut -c1-$${SHORT_COMMIT_LENGTH:?}`
27-
JULIA_BINARYDIST_FILENAME=`make print-JULIA_BINARYDIST_FILENAME | cut -c27-`
2827
ARTIFACT_FILE_EXTENSION="tar.gz"
29-
ARTIFACT_FILENAME="$${JULIA_BINARYDIST_FILENAME:?}.$${ARTIFACT_FILE_EXTENSION:?}"
28+
ARTIFACT_FILENAME="julia-$${SHORT_COMMIT:?}-${PLATFORM?}${ARCH?}.$${ARTIFACT_FILE_EXTENSION:?}"
29+
JULIA_BINARYDIST_FILENAME=`make print-JULIA_BINARYDIST_FILENAME | cut -c27-`
30+
JULIA_BINARYDIST="$${JULIA_BINARYDIST_FILENAME:?}.$${ARTIFACT_FILE_EXTENSION:?}"
31+
3032
echo "The full commit is: $${BUILDKITE_COMMIT:?}"
3133
echo "The short commit is: $${SHORT_COMMIT:?}"
3234
echo "The artifact filename will be: $${ARTIFACT_FILENAME:?}"
@@ -43,7 +45,10 @@ steps:
4345
4446
echo "--- Create build artifacts"
4547
make -j 8 binary-dist
48+
ls -l $${JULIA_BINARYDIST:?}
49+
if [[ "$${JULIA_BINARYDIST:?}" != "$${ARTIFACT_FILENAME:?}" ]]; then
50+
mv $${JULIA_BINARYDIST:?} $${ARTIFACT_FILENAME:?}
51+
fi
4652
ls -l $${ARTIFACT_FILENAME:?}
47-
4853
echo "--- Upload build artifacts"
4954
buildkite-agent artifact upload $${ARTIFACT_FILENAME:?}

‎.buildkite/pipelines/main/platforms/platforms.sh‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
44

5-
PLATFORM="$1"
5+
OS="$1"
66

7-
cat "$SCRIPT_DIR/$PLATFORM.arches" | tr -s ' ' | while read _line; do
7+
cat "$SCRIPT_DIR/$OS.arches" | tr -s ' ' | while read _line; do
88
# Remove whitespace from the beginning and end of each line
99
line=`echo $_line | tr -s ' '`
1010

@@ -13,12 +13,14 @@ cat "$SCRIPT_DIR/$PLATFORM.arches" | tr -s ' ' | while read _line; do
1313
continue
1414
fi
1515

16-
export ARCH=`echo $line | cut -d ' ' -f 1`
17-
export ARCH_LABEL=`echo $line | cut -d ' ' -f 2`
18-
export ROOTFS_ARCH=`echo $line | cut -d ' ' -f 3`
19-
export TIMEOUT=`echo $line | cut -d ' ' -f 4`
20-
export ROOTFS_TAG=`echo $line | cut -d ' ' -f 5`
21-
export ROOTFS_TREE=`echo $line | cut -d ' ' -f 6`
22-
echo "Launching: $PLATFORM $ARCH $ARCH_LABEL $ROOTFS_ARCH $TIMEOUT"
23-
buildkite-agent pipeline upload "$SCRIPT_DIR/$PLATFORM.yml"
16+
export PLATFORM=`echo $line | cut -d ' ' -f 1`
17+
export ARCH=`echo $line | cut -d ' ' -f 2`
18+
export ARCH_LABEL=`echo $line | cut -d ' ' -f 3`
19+
export ROOTFS_ARCH=`echo $line | cut -d ' ' -f 4`
20+
export ALLOW_FAIL=`echo $line | cut -d ' ' -f 5`
21+
export TIMEOUT=`echo $line | cut -d ' ' -f 6`
22+
export ROOTFS_TAG=`echo $line | cut -d ' ' -f 7`
23+
export ROOTFS_TREE=`echo $line | cut -d ' ' -f 8`
24+
echo "Launching: $OS $PLATFORM $ARCH $ARCH_LABEL $ROOTFS_ARCH $ALLOW_FAIL $TIMEOUT"
25+
buildkite-agent pipeline upload "$SCRIPT_DIR/$OS.yml"
2426
done

‎.buildkite/pipelines/main/platforms/tester_linux.arches‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# ARCH ARCH_LABEL ROOTFS_ARCH TIMEOUT ROOTFS_TAG ROOTFS_TREE
2-
# aarch64 aarch64 aarch64 60 v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3-
# armv7l armv7l armv7l 60 v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4-
32 32 i686 60 v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5-
# ppc64le ppc64le powerpc64le 60 v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6-
64 64_rr x86_64 180 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7-
64 64_st x86_64 60 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
8-
64 64_mt x86_64 60 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
1+
# PLATFORM ARCH ARCH_LABEL ROOTFS_ARCH ALLOW_FAIL TIMEOUT ROOTFS_TAG ROOTFS_TREE
2+
# linux aarch64 aarch64 aarch64 false 60 v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3+
# linux armv7l armv7l armv7l false 60 v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4+
linux 32 32 i686 false 60 v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5+
# linux ppc64le ppc64le powerpc64le false 60 v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6+
linux 64 64_rr x86_64 false 180 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7+
linux 64 64_st x86_64 false 60 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
8+
linux 64 64_mt x86_64 false 60 v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
9+
musl 64 64 x86_64 true 60 v3.19 e6a2730e37c386c46915b2650d6aaaa398195152

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ agents:
44
sandbox.jl: "true"
55
os: "linux"
66
steps:
7-
- label: "tester_linux${ARCH_LABEL?}"
8-
key: tester_linux${ARCH_LABEL?}
9-
depends_on: package_linux${ARCH?}
7+
- label: "tester_${PLATFORM?}${ARCH_LABEL?}"
8+
key: tester_${PLATFORM?}${ARCH_LABEL?}
9+
depends_on: package_${PLATFORM?}${ARCH?}
1010
plugins:
1111
- JuliaCI/julia#v1:
1212
# Drop default "registries" directory, so it is not persisted from execution to execution
1313
persist_depot_dirs: packages,artifacts,compiled
1414
version: '1.6'
1515
- staticfloat/sandbox#v1:
16-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/${ROOTFS_TAG?}/package_linux.${ROOTFS_ARCH?}.tar.gz
16+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/${ROOTFS_TAG?}/package_${PLATFORM?}.${ROOTFS_ARCH?}.tar.gz
17+
# rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/${ROOTFS_TAG?}/tester${PLATFORM?}.${ROOTFS_ARCH?}.tar.gz
1718
rootfs_treehash: "${ROOTFS_TREE?}"
1819
uid: 1000
1920
gid: 1000
@@ -23,14 +24,15 @@ steps:
2324
env:
2425
JULIA_SHELL: "/bin/bash"
2526
timeout_in_minutes: ${TIMEOUT?}
27+
soft_fail: ${ALLOW_FAIL?}
2628
commands: |
2729
echo "--- Print the full and short commit hashes"
2830
SHORT_COMMIT_LENGTH=10
2931
SHORT_COMMIT=`echo $${BUILDKITE_COMMIT:?} | cut -c1-$${SHORT_COMMIT_LENGTH:?}`
3032
JULIA_DIR="julia-$${SHORT_COMMIT:?}"
3133
JULIA_BINARY="$${JULIA_DIR:?}/bin/julia"
3234
ARTIFACT_FILE_EXTENSION="tar.gz"
33-
ARTIFACT_FILENAME="julia-$${SHORT_COMMIT:?}-linux${ARCH?}.$${ARTIFACT_FILE_EXTENSION:?}"
35+
ARTIFACT_FILENAME="julia-$${SHORT_COMMIT:?}-${PLATFORM?}${ARCH?}.$${ARTIFACT_FILE_EXTENSION:?}"
3436
echo "The full commit is: $${BUILDKITE_COMMIT:?}"
3537
echo "The short commit is: $${SHORT_COMMIT:?}"
3638
echo "The artifact filename will be: $${ARTIFACT_FILENAME:?}"

0 commit comments

Comments
 (0)