From 10347f4e8d749d96f9c64ffa8fa774e9f4952e58 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sat, 27 Jul 2024 17:23:48 +0100 Subject: [PATCH 1/6] Update CMake version used when building Somewhat hacky way to fix https://github.com/JuliaCI/julia-buildkite/issues/314 and to get https://github.com/JuliaCI/julia-buildkite/pull/345 working again. --- utilities/build_julia.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utilities/build_julia.sh b/utilities/build_julia.sh index e01f42645..15652ee6f 100755 --- a/utilities/build_julia.sh +++ b/utilities/build_julia.sh @@ -19,6 +19,9 @@ ld -v echo buildkite-agent --version +echo "--- Update CMake" +contrib/download_cmake.sh + echo "--- Collect make options" # These are the flags we'll provide to `make` MFLAGS=() From 64f141da15558ebd28c5d4779fc117101799961b Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sat, 27 Jul 2024 17:43:53 +0100 Subject: [PATCH 2/6] Only update CMake with llvm_passes image --- pipelines/main/platforms/build_linux.yml | 1 + utilities/build_julia.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pipelines/main/platforms/build_linux.yml b/pipelines/main/platforms/build_linux.yml index 6e4765d31..b5a29dc50 100644 --- a/pipelines/main/platforms/build_linux.yml +++ b/pipelines/main/platforms/build_linux.yml @@ -32,3 +32,4 @@ steps: # Receive some environment mappings from our templating engine TRIPLET: "${TRIPLET?}" MAKE_FLAGS: "${MAKE_FLAGS?}" + ROOTFS_IMAGE_NAME: "{ROOTFS_IMAGE_NAME?}" diff --git a/utilities/build_julia.sh b/utilities/build_julia.sh index 15652ee6f..bc1726daf 100755 --- a/utilities/build_julia.sh +++ b/utilities/build_julia.sh @@ -19,8 +19,10 @@ ld -v echo buildkite-agent --version -echo "--- Update CMake" -contrib/download_cmake.sh +if [[ "${ROOTFS_IMAGE_NAME-}" == llvm_passes ]]; then + echo "--- Update CMake" + contrib/download_cmake.sh +fi echo "--- Collect make options" # These are the flags we'll provide to `make` From 89b2db1fefafd2f180360cd204e1ab2f0a1fee02 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sat, 27 Jul 2024 18:01:28 +0100 Subject: [PATCH 3/6] Potential Fix --- utilities/build_julia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/build_julia.sh b/utilities/build_julia.sh index bc1726daf..87585ab73 100755 --- a/utilities/build_julia.sh +++ b/utilities/build_julia.sh @@ -19,7 +19,7 @@ ld -v echo buildkite-agent --version -if [[ "${ROOTFS_IMAGE_NAME-}" == llvm_passes ]]; then +if [[ "${ROOTFS_IMAGE_NAME-}" == "llvm_passes" ]]; then echo "--- Update CMake" contrib/download_cmake.sh fi From 649ca8834e31747e65748c4ec5d4aeb8718db17e Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sat, 27 Jul 2024 18:27:53 +0100 Subject: [PATCH 4/6] Try print debugging --- utilities/build_julia.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utilities/build_julia.sh b/utilities/build_julia.sh index 87585ab73..815011501 100755 --- a/utilities/build_julia.sh +++ b/utilities/build_julia.sh @@ -19,6 +19,8 @@ ld -v echo buildkite-agent --version +echo "${ROOTFS_IMAGE_NAME-}" +echo ROOTFS_IMAGE_NAME if [[ "${ROOTFS_IMAGE_NAME-}" == "llvm_passes" ]]; then echo "--- Update CMake" contrib/download_cmake.sh From 0b6086b9a959fc00d34d989a16ee004bfc66c445 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sat, 27 Jul 2024 18:31:16 +0100 Subject: [PATCH 5/6] Fix typo --- pipelines/main/platforms/build_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/main/platforms/build_linux.yml b/pipelines/main/platforms/build_linux.yml index b5a29dc50..e43eb1289 100644 --- a/pipelines/main/platforms/build_linux.yml +++ b/pipelines/main/platforms/build_linux.yml @@ -32,4 +32,4 @@ steps: # Receive some environment mappings from our templating engine TRIPLET: "${TRIPLET?}" MAKE_FLAGS: "${MAKE_FLAGS?}" - ROOTFS_IMAGE_NAME: "{ROOTFS_IMAGE_NAME?}" + ROOTFS_IMAGE_NAME: "${ROOTFS_IMAGE_NAME?}" From 635d80532ba6359490962e0fdd26709f1267c0d6 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sat, 27 Jul 2024 18:33:44 +0100 Subject: [PATCH 6/6] Remove debugging echos --- utilities/build_julia.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/utilities/build_julia.sh b/utilities/build_julia.sh index 815011501..87585ab73 100755 --- a/utilities/build_julia.sh +++ b/utilities/build_julia.sh @@ -19,8 +19,6 @@ ld -v echo buildkite-agent --version -echo "${ROOTFS_IMAGE_NAME-}" -echo ROOTFS_IMAGE_NAME if [[ "${ROOTFS_IMAGE_NAME-}" == "llvm_passes" ]]; then echo "--- Update CMake" contrib/download_cmake.sh