[Github] Add git to actions container image #80341
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
@llvm/pr-subscribers-github-workflow Author: Aiden Grossman (boomanaiden154) ChangesThis 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. Full diff: https://github.com/llvm/llvm-project/pull/80341.diff 1 Files Affected:
diff --git a/.github/workflows/containers/github-action-ci/Dockerfile b/.github/workflows/containers/github-action-ci/Dockerfile
index 2f86b9ba1ef44..66fa81d5a10ae 100644
--- a/.github/workflows/containers/github-action-ci/Dockerfile
+++ b/.github/workflows/containers/github-action-ci/Dockerfile
@@ -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
@@ -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
|
tstellar
approved these changes
Feb 2, 2024
agozillon
pushed a commit
to agozillon/llvm-project
that referenced
this pull request
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.