Skip to content

Commit 47b8fed

Browse files
lumirlumirCopilot
andauthored
ci(*): add support for LLVM 21 (llvm-build-bump-pr) (#394)
This pull request updates the `.github/workflows/llvm-build-bump-pr.yml` workflow to improve compatibility and reliability of the build process across multiple platforms. The main changes involve switching from custom Ubuntu images to standard Docker images, updating package installation commands, and adjusting dependency installation steps. **Platform and Docker image updates:** * The `matrix.docker` configuration now uses standard Docker images (`python:3.10.18-bullseye` for ARM and `buildpack-deps:jammy` for PPC64 and S390X) instead of custom Ubuntu images, simplifying image management and improving consistency across platforms. **Build and dependency installation changes:** * All `apt` commands have been replaced with `apt-get` for better scripting reliability, and package installation steps have been updated to match the new images. [[1]](diffhunk://#diff-d608eb75b383338d789a8908995e47499214a7cc55a847771ad73800464b18b0L87-R88) [[2]](diffhunk://#diff-d608eb75b383338d789a8908995e47499214a7cc55a847771ad73800464b18b0L208-R210) * The Docker run command now uses the new `image` variable instead of the deprecated `ubuntu-image`, ensuring the correct image is used for each platform. * The dependency installation step inside Docker now installs specific versions of `cmake` and `pyinstaller` via `pip`, and removes unnecessary packages (`git`, `g++`). **Workflow variable and debug updates:** * Debug output and Docker run commands have been updated to use the new `image` variable instead of `ubuntu-image`, reflecting the changes in the matrix configuration. [[1]](diffhunk://#diff-d608eb75b383338d789a8908995e47499214a7cc55a847771ad73800464b18b0L187-R187) [[2]](diffhunk://#diff-d608eb75b383338d789a8908995e47499214a7cc55a847771ad73800464b18b0L197-R197) --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
1 parent fa366aa commit 47b8fed

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/llvm-build-bump-pr.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ jobs:
8484
8585
- name: Set up dependencies
8686
run: |
87-
sudo apt update -y
88-
sudo apt install -y ninja-build
87+
sudo apt-get update -y
88+
sudo apt-get install -y ninja-build
8989
pip install pyinstaller
9090
9191
- name: Set up checkout
@@ -164,16 +164,16 @@ jobs:
164164
matrix:
165165
docker:
166166
- platform: arm/v7
167-
ubuntu-image: arm32v7
167+
image: python:3.10.18-bullseye
168168
node-name: arm
169169
- platform: arm64/v8
170-
ubuntu-image: arm64v8
170+
image: python:3.10.18-bullseye
171171
node-name: arm64
172172
- platform: ppc64le
173-
ubuntu-image: ppc64le
173+
image: buildpack-deps:jammy
174174
node-name: ppc64
175175
- platform: s390x
176-
ubuntu-image: s390x
176+
image: buildpack-deps:jammy
177177
node-name: s390x
178178

179179
runs-on: ubuntu-22.04
@@ -184,7 +184,7 @@ jobs:
184184

185185
steps:
186186
- name: Debug matrix
187-
run: echo ${{ matrix.docker.platform }} ${{ matrix.docker.ubuntu-image }} ${{ matrix.docker.node-name }}
187+
run: echo ${{ matrix.docker.platform }} ${{ matrix.docker.image }} ${{ matrix.docker.node-name }}
188188

189189
- name: Set up QEMU
190190
uses: docker/setup-qemu-action@v3
@@ -194,7 +194,7 @@ jobs:
194194
# Use the oldest ubuntu image version possible for backward compatibility.
195195
- name: Docker run
196196
run: |
197-
docker run --name ${{ matrix.docker.node-name }} --platform linux/${{ matrix.docker.platform }} ${{ matrix.docker.ubuntu-image }}/ubuntu:22.04 /bin/bash -c "
197+
docker run --name ${{ matrix.docker.node-name }} --platform linux/${{ matrix.docker.platform }} ${{ matrix.docker.image }} /bin/bash -c "
198198
echo ---Set up environment variables--- &&
199199
export DEBIAN_FRONTEND=noninteractive &&
200200
@@ -205,9 +205,9 @@ jobs:
205205
pwd &&
206206
207207
echo ---Set up dependencies--- &&
208-
apt update -y &&
209-
apt install -y git python3 python3-pip g++ cmake ninja-build &&
210-
pip install pyinstaller &&
208+
apt-get update -y &&
209+
apt-get install -y python3 python3-pip ninja-build &&
210+
pip install cmake==3.31.6 pyinstaller &&
211211
212212
echo ---Set up checkout--- &&
213213
git clone --depth 1 --branch ${{ needs.stage1.outputs.LLVM_LATEST_RELEASE_TAG_NAME }} https://github.com/${{ env.LLVM_REPO }}.git &&

0 commit comments

Comments
 (0)