Skip to content

Commit

Permalink
[Github] Add git to actions container image
Browse files Browse the repository at this point in the history
This patch adds git to the actions container image. This is not
necessarily needed for actions/checkout (as it will fallback to
downloading a tar archive), but is good to have for that in addition to
any future operations that might need git. In addition, the LLVM CMake
configuration throws some warnings when Git is not installed.

This patch also removes a slash from LLVM_SYSROOT. This is cosmetic as
/opt/llvm//bin (which showed up on $PATH) is equivalent to
/opt/llvm/bin, but the latter is canonical.
  • Loading branch information
boomanaiden154 committed Feb 1, 2024
1 parent edbd93d commit 71c0225
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/containers/github-action-ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM docker.io/library/ubuntu:22.04 as base
ENV LLVM_SYSROOT=/opt/llvm/
ENV LLVM_SYSROOT=/opt/llvm

FROM base as toolchain
ENV LLVM_VERSION=17.0.6
Expand All @@ -11,7 +11,8 @@ RUN apt-get update && \
g++ \
cmake \
ninja-build \
python3
python3 \
git

RUN wget https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && tar -xf llvmorg-$LLVM_VERSION.tar.gz

Expand Down

0 comments on commit 71c0225

Please sign in to comment.