Skip to content

Commit 73cd4cf

Browse files
committed
[CI] fix LLVM installation on Linux CI
1 parent 1a49a42 commit 73cd4cf

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/Linux.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030

3131
jobs:
3232
build:
33-
name: Linux-${{ matrix.arch }} ( ${{ matrix.kind }}-${{ matrix.mode }} )
33+
name: Linux-${{ matrix.arch }} (${{ matrix.kind }}-${{ matrix.mode }})
3434

3535
strategy:
3636
fail-fast: false
@@ -75,16 +75,21 @@ jobs:
7575
# path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
7676
# key: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.cache_key.outputs.key }}
7777

78+
- name: Add LLVM apt repository
79+
run: |
80+
sudo 'echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
81+
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" >> /etc/apt/source.list'
82+
sudo apt update
83+
7884
- name: Install LLVM and Clang
79-
uses: KyleMayes/install-llvm-action@v2
85+
uses: awalsh128/cache-apt-pkgs-action@latest
8086
with:
81-
version: "19.1.3"
82-
directory: ${{ runner.temp }}/llvm
87+
packages: clang libc++-dev libc++1 libc++abi-dev libc++abi1 mold llvm-runtime llvm
8388

8489
- name: Configure & Build
8590
id: build
8691
run: |
87-
xmake f -v -a ${{ (matrix.arch == "x64") && "x86_64" || (matrix.arch == "arm64") && "aarch64" || matrix.arch }} --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'debug' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --mold=y --runtimes="c++_shared" --sdk="${{ runner.temp }}/llvm"
92+
xmake f -v -a ${{ (matrix.arch == 'x64') && 'x86_64' || (matrix.arch == 'arm64') && 'aarch64' || matrix.arch }} --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'debug' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --mold=y --runtimes="c++_shared" --sdk="${{ runner.temp }}/llvm"
8893
xmake b -v
8994
9095
- name: Tests

.github/workflows/macOS.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929

3030
jobs:
3131
build:
32-
name: ${{ matrix.os }}-${{ matrix.arch }} ( ${{ matrix.kind }}-${{ matrix.mode }} )
32+
name: ${{ matrix.os }}-${{ matrix.arch }} (${{ matrix.kind }}-${{ matrix.mode }})
3333
strategy:
3434
fail-fast: false
3535
matrix:

0 commit comments

Comments
 (0)