Skip to content

[Github] Bump CI container to LLVM 20.1.1 #132567

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

Conversation

boomanaiden154
Copy link
Contributor

This patch bumps the CI container to the latest LLVM Release and gets rid of
the patch that we were carrying that is in 20.1.1.

Created using spr 1.3.4
@llvmbot
Copy link
Member

llvmbot commented Mar 22, 2025

@llvm/pr-subscribers-github-workflow

Author: Aiden Grossman (boomanaiden154)

Changes

This patch bumps the CI container to the latest LLVM Release and gets rid of
the patch that we were carrying that is in 20.1.1.


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

1 Files Affected:

  • (modified) .github/workflows/containers/github-action-ci/Dockerfile (+1-7)
diff --git a/.github/workflows/containers/github-action-ci/Dockerfile b/.github/workflows/containers/github-action-ci/Dockerfile
index bd3720017b7f7..ef4a11013acb3 100644
--- a/.github/workflows/containers/github-action-ci/Dockerfile
+++ b/.github/workflows/containers/github-action-ci/Dockerfile
@@ -2,7 +2,7 @@ FROM docker.io/library/ubuntu:22.04 as base
 ENV LLVM_SYSROOT=/opt/llvm
 
 FROM base as stage1-toolchain
-ENV LLVM_VERSION=19.1.5
+ENV LLVM_VERSION=20.1.1
 
 RUN apt-get update && \
     apt-get install -y \
@@ -20,12 +20,6 @@ RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$L
 
 WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
 
-# Patch to enable better PGO profile data.
-# TODO: Remove this for llvm 20
-ADD https://github.com/llvm/llvm-project/commit/738250989ce516f02f809bdfde474a039c77e81f.patch .
-
-RUN patch -p1 < 738250989ce516f02f809bdfde474a039c77e81f.patch
-
 RUN cmake -B ./build -G Ninja ./llvm \
   -C ./clang/cmake/caches/BOLT-PGO.cmake \
   -DBOOTSTRAP_LLVM_ENABLE_LLD=ON \

boomanaiden154 added a commit to boomanaiden154/llvm-project that referenced this pull request Mar 27, 2025
This patch bumps the CI container to the latest LLVM Release and gets rid of
the patch that we were carrying that is in 20.1.1.

Pull Request: llvm#132567
@boomanaiden154 boomanaiden154 merged commit 5cb3052 into main Mar 27, 2025
14 checks passed
@boomanaiden154 boomanaiden154 deleted the users/boomanaiden154/github-bump-ci-container-to-llvm-2011 branch March 27, 2025 19:15
llvm-sync bot pushed a commit to arm/arm-toolchain that referenced this pull request Mar 27, 2025
This patch bumps the CI container to the latest LLVM Release and gets rid of
the patch that we were carrying that is in 20.1.1.

Reviewers: tstellar

Reviewed By: tstellar

Pull Request: llvm/llvm-project#132567
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.

3 participants