Skip to content

Commit bd8d591

Browse files
committed
feat (build): centralize LLVM_VERSION
1 parent 3b97f13 commit bd8d591

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/ci/docker/scripts/build-clang.sh

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

33
set -ex
44

5+
source versions.sh
56
source shared.sh
67

7-
# Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh
8-
LLVM=llvmorg-20.1.0-rc2
8+
# Should be in sync with src/ci/scripts/install-clang.sh
9+
LLVM=llvmorg-$LLVM_VERSION
910

1011
mkdir llvm-project
1112
cd llvm-project

src/ci/docker/scripts/versions.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
# ignore-tidy-linelength
3+
4+
# To keep docker / non-docker builds in sync
5+
6+
# renovate: datasource=github-releases depName=llvm/llvm-project versioning=semver-coerced extractVersion=^llvmorg-(?<version>\d+\.\d+\.\d+(?:.*))
7+
export LLVM_VERSION=20.1.3

src/ci/scripts/install-clang.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
set -euo pipefail
88
IFS=$'\n\t'
99

10+
# LLVM_VERSION should be in sync with src/ci/docker/scripts/build-clang.sh
11+
source "$(cd "$(dirname "$0")" && pwd)/../docker/scripts/versions.sh"
1012
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1113

1214
# Update both macOS's and Windows's tarballs when bumping the version here.
13-
# Try to keep this in sync with src/ci/docker/scripts/build-clang.sh
14-
LLVM_VERSION="20.1.3"
15-
1615
if isMacOS; then
1716
# FIXME: This is the latest pre-built version of LLVM that's available for
1817
# x86_64 MacOS. We may want to consider building our own LLVM binaries

0 commit comments

Comments
 (0)