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

[Github] Add Zlib at build time to CI container #123489

Merged

Conversation

boomanaiden154
Copy link
Contributor

This patch adds zlib at build time to the CI container. This is needed to make an lldb test pass that defaults to using the system lld if it is not explicitly enabled in LLVM_ENABLE_PROJECTS.

Fixes #123479 (by fixing the proximal cause).

This patch adds zlib at build time to the CI container. This is needed to make
an lldb test pass that defaults to using the system lld if it is not explicitly
enabled in LLVM_ENABLE_PROJECTS.

Fixes llvm#123479 (by fixing the proximal cause).
@llvmbot
Copy link
Member

llvmbot commented Jan 19, 2025

@llvm/pr-subscribers-github-workflow

Author: Aiden Grossman (boomanaiden154)

Changes

This patch adds zlib at build time to the CI container. This is needed to make an lldb test pass that defaults to using the system lld if it is not explicitly enabled in LLVM_ENABLE_PROJECTS.

Fixes #123479 (by fixing the proximal cause).


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

1 Files Affected:

  • (modified) .github/workflows/containers/github-action-ci/Dockerfile (+2-1)
diff --git a/.github/workflows/containers/github-action-ci/Dockerfile b/.github/workflows/containers/github-action-ci/Dockerfile
index 3757e603f8a102..b600d3b72d9547 100644
--- a/.github/workflows/containers/github-action-ci/Dockerfile
+++ b/.github/workflows/containers/github-action-ci/Dockerfile
@@ -13,7 +13,8 @@ RUN apt-get update && \
     ninja-build \
     python3 \
     git \
-    curl
+    curl \
+    zlib1g-dev
 
 RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && tar -xf llvmorg-$LLVM_VERSION.tar.gz
 

Copy link
Collaborator

@tstellar tstellar left a comment

Choose a reason for hiding this comment

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

LGTM. Is there a plan to fix the test too?

@boomanaiden154
Copy link
Contributor Author

Is there a plan to fix the test too?

This fixes the test. I want to fix the requires in the test too so it actually checks for what it needs, but putting that on the back-burner for now.

@boomanaiden154 boomanaiden154 merged commit e68d18c into llvm:main Jan 20, 2025
10 checks passed
@boomanaiden154 boomanaiden154 deleted the add-zlib-ci-container-linux branch January 20, 2025 19:50
@tstellar
Copy link
Collaborator

Is there a plan to fix the test too?

This fixes the test. I want to fix the requires in the test too so it actually checks for what it needs, but putting that on the back-burner for now.

OK, can you file an issue for this so it doesn't get forgotten?

@boomanaiden154
Copy link
Contributor Author

I kept #123479 open to track that.

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.

[CI] LLDB test failures related to zlib
3 participants