fix(act): use different LLVM versions

This commit is contained in:
Peter 2025-02-12 15:53:43 +01:00
parent b8cf004a6a
commit ed921006e9
Signed by: prskr
GPG key ID: F56BED6903BC5E37
2 changed files with 8 additions and 6 deletions
.forgejo/workflows
act_runtime

View file

@ -10,6 +10,9 @@ on:
- ".forgejo/workflows/act_runtime.yaml"
- "act_runtime/**"
env:
LLVM_VERSIONS: '{"24.04": "19", "22.04": "15"}'
jobs:
build_images:
strategy:
@ -40,3 +43,4 @@ jobs:
tags: code.icb4dc0.de/infrastructure/images/act_runtime:${{ matrix.base_tage }}
build-args: |
BASE_IMAGE=ubuntu:${{ matrix.base_tage }}
LLVM_VERSION=${{ fromJSON(env.LLVM_VERSIONS)[matrix.base_tage] }}

View file

@ -9,9 +9,7 @@ ARG TARGETARCH
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
# common tools
RUN --mount=type=cache,target=/var/lib/cache \
--mount=type=cache,target=/var/cache/apt \
apt-get update && \
RUN apt-get update && \
apt-get install -y \
lsb-release \
sudo \
@ -29,6 +27,7 @@ RUN --mount=type=cache,target=/var/lib/cache \
nodejs \
libgraphite2-3 \
zstd && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/clang /usr/bin/clang && \
ln -s -f /usr/lib/llvm-${LLVM_VERSION}/bin/llc /usr/bin/
@ -37,15 +36,14 @@ ADD --chmod=444 https://cli.github.com/packages/githubcli-archive-keyring.gpg /e
ADD --chmod=444 https://download.docker.com/linux/debian/gpg /etc/apt/keyrings/docker.asc
# Docker and other tools
RUN --mount=type=cache,target=/var/lib/cache \
--mount=type=cache,target=/var/cache/apt \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list && \
apt-get update && \
apt-get install -y \
gh \
docker-ce-cli docker-buildx-plugin && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# Rclone