From ea0b627dc411061bc1f20efa5e75bb8a005eb38e Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Mon, 15 Apr 2024 22:47:18 +0100
Subject: [PATCH] Merged linux-fresh and linux-appimage build envs

---
 .ci/linux.sh                 | 4 +++-
 .github/workflows/build.yml  | 2 +-
 .github/workflows/format.yml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.ci/linux.sh b/.ci/linux.sh
index a9755ff34..a059f9220 100755
--- a/.ci/linux.sh
+++ b/.ci/linux.sh
@@ -2,7 +2,7 @@
 
 if [ "$TARGET" = "appimage" ]; then
     # Compile the AppImage we distribute with Clang.
-    export EXTRA_CMAKE_FLAGS=(-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=/etc/bin/ld.lld)
+    export EXTRA_CMAKE_FLAGS=(-DCMAKE_LINKER=/etc/bin/ld.lld)
 else
     # For the linux-fresh verification target, verify compilation without PCH as well.
     export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF)
@@ -13,6 +13,8 @@ cmake .. -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER=clang++-18 \
+    -DCMAKE_C_COMPILER=clang-18 \
     "${EXTRA_CMAKE_FLAGS[@]}" \
     -DENABLE_QT_TRANSLATION=ON \
     -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ccd5d5b7..1b7e2cd3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
       matrix:
         target: ["appimage", "fresh"]
     container:
-      image: opensauce04/lime3ds-build:linux-${{ matrix.target }}
+      image: opensauce04/lime3ds-build:latest
       options: -u 1001
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 5b3beb43c..7529290d7 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -10,7 +10,7 @@ jobs:
   clang-format:
     runs-on: ubuntu-latest
     container:
-      image: opensauce04/lime3ds-build:linux-fresh
+      image: opensauce04/lime3ds-build:latest
       options: -u 1001
     steps:
       - uses: actions/checkout@v4