Skip to content

Commit 1123f2c

Browse files
chore(deps, cpp): update ccache to 4.12 (#927)
Co-authored-by: Gabriel Santos <[email protected]>
1 parent 5d03602 commit 1123f2c

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

.devcontainer/cpp/Dockerfile

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:24.04@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8
22

33
ARG BATS_VERSION=1.11.0
4-
ARG CCACHE_VERSION=4.11
4+
ARG CCACHE_VERSION=4.12
55
ARG CLANG_VERSION=18
66
ARG CPM_VERSION=0.40.2
77
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.22
@@ -68,16 +68,9 @@ RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \
6868
&& git -C /usr/local clone -b v0.3.0 https://github.com/bats-core/bats-support.git \
6969
&& git -C /usr/local clone -b v2.1.0 https://github.com/bats-core/bats-assert.git
7070

71-
# Install xwin
72-
RUN wget --no-hsts -qO - "https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz" | tar -xzv -C /usr/local/bin --strip-components=1 "xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl/xwin"
73-
74-
# Compile and install additional clang tools; often necessary as binary arm64 builds are lacking, or packages are out-of-date
75-
# Install ccache from source for a recent version
76-
RUN --mount=type=cache,target=/cache,sharing=locked \
77-
wget --no-hsts -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
78-
&& CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=Off -DENABLE_DOCUMENTATION=Off -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
79-
&& cmake --build /tmp/ccache-${CCACHE_VERSION}/build --target install \
80-
&& rm -rf /tmp/ccache-${CCACHE_VERSION}
71+
# Install xwin and ccache
72+
RUN wget --no-hsts -qO - "https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz" | tar -xzv -C /usr/local/bin --strip-components=1 "xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl/xwin" \
73+
&& wget --no-hsts -qO - "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}-linux-$(uname -m).tar.xz" | tar -xJ -C /usr/local/bin --strip-components=1 "ccache-${CCACHE_VERSION}-linux-$(uname -m)/ccache"
8174

8275
# Install include-what-you-use (iwyu) from source
8376
# hadolint ignore=DL3008

0 commit comments

Comments
 (0)