Skip to content

Commit 5b73685

Browse files
[𝘀𝗽𝗿] initial version
Created using spr 1.3.4
2 parents dfa665f + f55f358 commit 5b73685

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.github/workflows/build-ci-container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
id: vars
4545
run: |
4646
tag=$(git rev-parse --short=12 HEAD)
47-
container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/${{ matrix.arch }}/ci-ubuntu-22.04"
47+
container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/${{ matrix.arch }}/ci-ubuntu-24.04"
4848
echo "container-name=$container_name" >> $GITHUB_OUTPUT
4949
echo "container-name-agent=$container_name-agent" >> $GITHUB_OUTPUT
5050
echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM docker.io/library/ubuntu:22.04 as base
1+
FROM docker.io/library/ubuntu:24.04 as base
22
ENV LLVM_SYSROOT=/opt/llvm
33

44
FROM base as stage1-toolchain
5-
ENV LLVM_VERSION=19.1.5
5+
ENV LLVM_VERSION=20.1.1
66

77
RUN apt-get update && \
88
apt-get install -y \
@@ -20,12 +20,6 @@ RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$L
2020

2121
WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
2222

23-
# Patch to enable better PGO profile data.
24-
# TODO: Remove this for llvm 20
25-
ADD https://github.com/llvm/llvm-project/commit/738250989ce516f02f809bdfde474a039c77e81f.patch .
26-
27-
RUN patch -p1 < 738250989ce516f02f809bdfde474a039c77e81f.patch
28-
2923
RUN cmake -B ./build -G Ninja ./llvm \
3024
-C ./clang/cmake/caches/BOLT-PGO.cmake \
3125
-DBOOTSTRAP_LLVM_ENABLE_LLD=ON \

0 commit comments

Comments
 (0)