From 32f6d28d057a9c8bc8562259766eca06adbc8471 Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:59:05 +1100
Subject: [PATCH] trying again

---
 .github/workflows/build.yml    | 8 ++++----
 source/CMakePresets.json       | 2 ++
 triplets/x64-linux-mixed.cmake | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4211cbd..490eef5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,10 +89,10 @@ jobs:
   
   build_linux:
     name: Build OpenStarbound Linux x86_64
-    runs-on: ubuntu-20.04
-    #env:
-    #    CC: clang
-    #    CXX: clang++
+    runs-on: ubuntu-22.04
+    env:
+        CC: clang
+        CXX: clang++
 
     steps:
       - name: Install Packages
diff --git a/source/CMakePresets.json b/source/CMakePresets.json
index a2c59e9..7efdc23 100644
--- a/source/CMakePresets.json
+++ b/source/CMakePresets.json
@@ -47,6 +47,8 @@
       "binaryDir": "${sourceParentDir}/build/linux-release",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++",
         "VCPKG_TARGET_TRIPLET": "x64-linux-mixed",
         "CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/linux/include",
         "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/linux",
diff --git a/triplets/x64-linux-mixed.cmake b/triplets/x64-linux-mixed.cmake
index 545d6f0..5e93dff 100644
--- a/triplets/x64-linux-mixed.cmake
+++ b/triplets/x64-linux-mixed.cmake
@@ -3,7 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
-# set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
+set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
 
 if(PORT MATCHES "discord-")
     set(VCPKG_LIBRARY_LINKAGE dynamic)