Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[infra] Add git to Linux container #82687

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Conversation

sudonatalie
Copy link
Member

Fixes #82646

Copy link
Contributor

@boomanaiden154 boomanaiden154 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The failure in the stage2 container build is transient (or at least it was in the past). In the past I've been able to resolve it by just rerunning the stage2 job, but in this case that doesn't seem to work. I need to do some investigation there, but it's not super trivial to do experimentation given the total job sequence takes ~8 hours on the self-hosted github runners at this point.

llvm/test/CodeGen/SPIRV/basic_float_types.ll Outdated Show resolved Hide resolved
@tstellar
Copy link
Collaborator

Could we temporarily make the existing container a base container and then just install git on top of it?

@sudonatalie sudonatalie marked this pull request as ready for review March 5, 2024 14:31
@llvmbot
Copy link
Collaborator

llvmbot commented Mar 5, 2024

@llvm/pr-subscribers-github-workflow

Author: Natalie Chouinard (sudonatalie)

Changes

Fixes #82646


Full diff: https://github.com/llvm/llvm-project/pull/82687.diff

1 Files Affected:

  • (modified) .github/workflows/containers/github-action-ci/stage2.Dockerfile (+2)
diff --git a/.github/workflows/containers/github-action-ci/stage2.Dockerfile b/.github/workflows/containers/github-action-ci/stage2.Dockerfile
index e1a06cb68a589e..0ca0da87734c4c 100644
--- a/.github/workflows/containers/github-action-ci/stage2.Dockerfile
+++ b/.github/workflows/containers/github-action-ci/stage2.Dockerfile
@@ -12,11 +12,13 @@ COPY --from=stage2-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
 # Need to install curl for hendrikmuhs/ccache-action
 # Need nodejs for some of the GitHub actions.
 # Need perl-modules for clang analyzer tests.
+# Need git for SPIRV-Tools tests.
 RUN apt-get update && \
     apt-get install -y \
     binutils \
     cmake \
     curl \
+    git \
     libstdc++-11-dev \
     ninja-build \
     nodejs \

@sudonatalie
Copy link
Member Author

Checks are passing following #83707 !

@sudonatalie sudonatalie merged commit da63746 into llvm:main Mar 5, 2024
9 checks passed
@sudonatalie sudonatalie deleted the container-fix branch March 5, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[infra] Add git CLI to Linux container
4 participants