Skip to content

Commit 28f5e89

Browse files
committed
adjust toolchain so we can keep uncrustify on 0.68.1
1 parent 3c9cb09 commit 28f5e89

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

circleci/images/stylechecker/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:latest
1+
FROM alpine:3.22
22
ARG TOOLS_VERSION
33

44
COPY ./files/etc/requirements.txt /tmp/etc/
@@ -19,11 +19,11 @@ apk add --no-cache --virtual installdeps \
1919
py3-pip \
2020
python3-dev \
2121
tar \
22-
llvm21 \
23-
llvm21-dev \
24-
llvm21-libs \
25-
llvm21-linker-tools \
26-
llvm21-static \
22+
llvm20 \
23+
llvm20-dev \
24+
llvm20-libs \
25+
llvm20-linker-tools \
26+
llvm20-static \
2727
clang \
2828
elfutils-dev \
2929
zlib-dev \
@@ -40,7 +40,7 @@ apk add --no-cache \
4040
openssh \
4141
perl \
4242
python3 \
43-
py3-packaging \
43+
py3-packaging
4444

4545
curl -fsSL "https://codeload.github.com/citusdata/tools/tar.gz/v${TOOLS_VERSION}" | tar xz
4646
cd "tools-${TOOLS_VERSION}"
@@ -52,7 +52,7 @@ curl -fsSL "https://codeload.github.com/uncrustify/uncrustify/tar.gz/uncrustify-
5252
cd uncrustify-uncrustify-0.68.1/
5353
mkdir build
5454
cd build
55-
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
55+
cmake ..
5656
make -j5
5757
make install
5858
cd ../..
@@ -66,19 +66,19 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profil
6666
rustup toolchain install nightly-x86_64-unknown-linux-musl
6767
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-musl
6868
export PATH="/root/.cargo/bin:${PATH}"
69-
export PATH="/usr/lib/llvm21/bin:${PATH}"
69+
export PATH="/usr/lib/llvm20/bin:${PATH}"
7070

71-
LLVM_CONFIG="$(command -v llvm-config || command -v llvm-config-21)"
71+
LLVM_CONFIG="$(command -v llvm-config || command -v llvm-config-20)"
7272
LLVM_LIBDIR="$(${LLVM_CONFIG} --libdir)"
7373
LLVM_PREFIX="$(dirname "${LLVM_LIBDIR}")"
7474
export LD_LIBRARY_PATH="${LLVM_LIBDIR}:${LD_LIBRARY_PATH:-}"
7575
export PKG_CONFIG_PATH="${LLVM_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH:-}"
76-
export LLVM_SYS_211_PREFIX="${LLVM_SYS_211_PREFIX:-${LLVM_PREFIX}}"
77-
export LLVM_SYS_211_STATIC=1
76+
export LLVM_SYS_200_PREFIX="${LLVM_SYS_200_PREFIX:-${LLVM_PREFIX}}"
77+
export LLVM_SYS_200_STATIC=1
7878
export AYA_RUSTC_LLVM_PROXY_DISABLE_DLOPEN=1
7979
export AYA_RUSTC_LLVM_PROXY_LIB_DIR="${LLVM_LIBDIR}"
8080

81-
cargo install --locked bpf-linker --version 0.9.15 --no-default-features --features llvm-21
81+
cargo install --locked bpf-linker --version 0.9.15 --no-default-features --features llvm-20
8282

8383

8484
install -m 755 "$CARGO_HOME/bin/bpf-linker" /usr/local/bin/bpf-linker

0 commit comments

Comments
 (0)