github actions: switch to llvm automated install script

tyler569 · May 9, 2024 · 8736a00 · 8736a00
1 parent 6475c9b
commit 8736a00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,14 +11,16 @@ jobs:
           fetch-depth: 0
       - name: Install OS dependancies
         run: |
-          sudo apt update
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository -y "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
           sudo apt-get update
           sudo apt-get upgrade
-          sudo apt install git make cmake ninja-build ruby clang lld xorriso mtools qemu-system
+          sudo apt-get install git make cmake ninja-build ruby xorriso mtools qemu-system wget
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 18
       - name: build
-        run: make
+        run: |
+          cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain/CMake/CMakeToolchain.txt
+          cmake --build build
       - name: Upload ISO
         uses: actions/upload-artifact@v2
         with:

diff --git a/toolchain/CMake/CMakeToolchain.txt b/toolchain/CMake/CMakeToolchain.txt
@@ -4,9 +4,9 @@ set(CMAKE_SYSTEM_PROCESSOR X86_64)
 
 set(triple x86_64-unknown-none)
 
-set(CMAKE_ASM_COMPILER clang)
+set(CMAKE_ASM_COMPILER clang-18)
 set(CMAKE_ASM_COMPILER_TARGET ${triple})
-set(CMAKE_C_COMPILER clang)
+set(CMAKE_C_COMPILER clang-18)
 set(CMAKE_C_COMPILER_TARGET ${triple})
 set(CMAKE_LINKER ld.lld)