From bd8d5911ca74fec8680a2f4e8cfb49863f87eb75 Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Fri, 20 Jun 2025 15:38:59 +0200 Subject: [PATCH] feat (build): centralize LLVM_VERSION --- src/ci/docker/scripts/build-clang.sh | 5 +++-- src/ci/docker/scripts/versions.sh | 7 +++++++ src/ci/scripts/install-clang.sh | 5 ++--- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 src/ci/docker/scripts/versions.sh diff --git a/src/ci/docker/scripts/build-clang.sh b/src/ci/docker/scripts/build-clang.sh index 536991cc06b7d..c395f0b68ed47 100755 --- a/src/ci/docker/scripts/build-clang.sh +++ b/src/ci/docker/scripts/build-clang.sh @@ -2,10 +2,11 @@ set -ex +source versions.sh source shared.sh -# Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh -LLVM=llvmorg-20.1.0-rc2 +# Should be in sync with src/ci/scripts/install-clang.sh +LLVM=llvmorg-$LLVM_VERSION mkdir llvm-project cd llvm-project diff --git a/src/ci/docker/scripts/versions.sh b/src/ci/docker/scripts/versions.sh new file mode 100644 index 0000000000000..a9e5193d5b8c9 --- /dev/null +++ b/src/ci/docker/scripts/versions.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# ignore-tidy-linelength + +# To keep docker / non-docker builds in sync + +# renovate: datasource=github-releases depName=llvm/llvm-project versioning=semver-coerced extractVersion=^llvmorg-(?\d+\.\d+\.\d+(?:.*)) +export LLVM_VERSION=20.1.3 diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index a9528e9291595..5d7c1612c13ac 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -7,12 +7,11 @@ set -euo pipefail IFS=$'\n\t' +# LLVM_VERSION should be in sync with src/ci/docker/scripts/build-clang.sh +source "$(cd "$(dirname "$0")" && pwd)/../docker/scripts/versions.sh" source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # Update both macOS's and Windows's tarballs when bumping the version here. -# Try to keep this in sync with src/ci/docker/scripts/build-clang.sh -LLVM_VERSION="20.1.3" - if isMacOS; then # FIXME: This is the latest pre-built version of LLVM that's available for # x86_64 MacOS. We may want to consider building our own LLVM binaries