Skip to content

Commit ef17bc6

Browse files
committed
Meta: Bump CI LLVM version to 22
1 parent ec3f4d3 commit ef17bc6

3 files changed

Lines changed: 20 additions & 6 deletions

File tree

.github/actions/clang-windows/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ inputs:
66
llvm_version:
77
description: 'Version of LLVM to build and cache'
88
required: false
9-
default: 16.0.6
9+
default: 22.1.4
1010
llvm_branch:
1111
description: 'Specific LLVM branch to build'
1212
required: false
13-
default: "llvmorg-16.0.6"
13+
default: "llvmorg-22.1.4"
1414

1515
runs:
1616
using: composite

.github/workflows/ci.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: true
2828
matrix:
2929
platform: [ubuntu-22.04]
30-
cxx_compiler: [clang++-18]
30+
cxx_compiler: [clang++-22]
3131
include:
3232
- platform: macos-latest
3333
cxx_compiler: "$(brew --prefix llvm@18)/bin/clang++"
@@ -51,7 +51,7 @@ jobs:
5151
sudo echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME} main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
5252
sudo echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-18 main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
5353
sudo apt-get update
54-
sudo apt-get install -y clang-18 libclang-18-dev
54+
sudo apt-get install -y clang-22 libclang-22-dev
5555
5656
- name: Install macOS dependencies
5757
if: ${{ matrix.platform == 'macos-latest' }}
@@ -107,7 +107,7 @@ jobs:
107107
108108
selfhost-windows:
109109
env:
110-
LLVM_VER: 18.1.6
110+
LLVM_VER: 22.1.4
111111

112112
strategy:
113113
fail-fast: true
@@ -125,6 +125,20 @@ jobs:
125125
version: 1.10.0
126126
dest: ${{ github.workspace }}/ninja_bin
127127

128+
- name: Cache Clang
129+
uses: actions/cache@v3
130+
id: cache-clang
131+
with:
132+
path: 'llvm-install-${{ env.LLVM_VER }}/'
133+
key: 'libclang-${{ runner.os }}-${{ env.LLVM_VER }}'
134+
135+
- name: Build clang if cache miss
136+
uses: ./.github/actions/clang-windows
137+
if: steps.cache-clang.outputs.cache-hit != 'true'
138+
with:
139+
llvm_version: "${{ env.LLVM_VER }}"
140+
llvm_branch: "llvmorg-${{ env.LLVM_VER }}"
141+
128142
- name: Configure CMake
129143
env:
130144
CMAKE_PREFIX_PATH: ${{ github.workspace }}/llvm-install-${{ env.LLVM_VER }}

.github/workflows/populate-windows-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44

55
env:
6-
LLVM_VER: 16.0.6
6+
LLVM_VER: 22.1.4
77

88
jobs:
99
build:

0 commit comments

Comments
 (0)