Skip to content

Commit 1bfea59

Browse files
author
git apple-llvm automerger
committed
Merge commit 'fcb7ed69d0b4' from llvm.org/main into next
2 parents eeb187a + fcb7ed6 commit 1bfea59

File tree

1 file changed

+12
-2
lines changed
  • .github/workflows/containers/github-action-ci

1 file changed

+12
-2
lines changed

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,21 @@ RUN apt-get update && \
6363
python3-pip \
6464
ccache \
6565
file \
66-
tzdata \
67-
sccache && \
66+
tzdata && \
6867
apt-get clean && \
6968
rm -rf /var/lib/apt/lists/*
7069

70+
# We need sccache for caching. We cannot use the apt repository version because
71+
# it is too old and has bugs related to features we require (particularly GCS
72+
# caching), so we manually install it here.
73+
# TODO(boomanaiden154): We should return to installing this from the apt
74+
# repository once a version containing the necessary bug fixes is available.
75+
RUN curl -L 'https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz' > /tmp/sccache.tar.gz && \
76+
echo "1fbb35e135660d04a2d5e42b59c7874d39b3deb17de56330b25b713ec59f849b /tmp/sccache.tar.gz" | sha256sum -c && \
77+
tar xzf /tmp/sccache.tar.gz -O --wildcards '*/sccache' > '/usr/local/bin/sccache' && \
78+
rm /tmp/sccache.tar.gz && \
79+
chmod +x /usr/local/bin/sccache
80+
7181
ENV LLVM_SYSROOT=$LLVM_SYSROOT
7282
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
7383

0 commit comments

Comments
 (0)