Skip to content

Commit 8736a00

Browse files
committed
github actions: switch to llvm automated install script
1 parent 6475c9b commit 8736a00

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ jobs:
1111
fetch-depth: 0
1212
- name: Install OS dependancies
1313
run: |
14-
sudo apt update
15-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
16-
sudo add-apt-repository -y "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
1714
sudo apt-get update
1815
sudo apt-get upgrade
19-
sudo apt install git make cmake ninja-build ruby clang lld xorriso mtools qemu-system
16+
sudo apt-get install git make cmake ninja-build ruby xorriso mtools qemu-system wget
17+
wget https://apt.llvm.org/llvm.sh
18+
chmod +x llvm.sh
19+
sudo ./llvm.sh 18
2020
- name: build
21-
run: make
21+
run: |
22+
cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain/CMake/CMakeToolchain.txt
23+
cmake --build build
2224
- name: Upload ISO
2325
uses: actions/upload-artifact@v2
2426
with:

toolchain/CMake/CMakeToolchain.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set(CMAKE_SYSTEM_PROCESSOR X86_64)
44

55
set(triple x86_64-unknown-none)
66

7-
set(CMAKE_ASM_COMPILER clang)
7+
set(CMAKE_ASM_COMPILER clang-18)
88
set(CMAKE_ASM_COMPILER_TARGET ${triple})
9-
set(CMAKE_C_COMPILER clang)
9+
set(CMAKE_C_COMPILER clang-18)
1010
set(CMAKE_C_COMPILER_TARGET ${triple})
1111
set(CMAKE_LINKER ld.lld)
1212

0 commit comments

Comments
 (0)