From 8736a0096fb91b9b1839f2a1973ed619c13d3835 Mon Sep 17 00:00:00 2001 From: Tyler Philbrick Date: Wed, 8 May 2024 19:51:44 -0700 Subject: [PATCH] github actions: switch to llvm automated install script --- .github/workflows/build.yml | 12 +++++++----- toolchain/CMake/CMakeToolchain.txt | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46401a6c..d4963081 100644 --- 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 index aa5615ff..739be00e 100644 --- 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)