Update to most recent Flatpak runtime (25.08)

Update LLVM from 18 to 20 at the same time

Author: TobiX

.github/workflows/validate.yml

@@ -9,7 +9,7 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-  
+
 jobs:
   build-linux:
     name: Build Linux
@@ -18,7 +18,7 @@ jobs:
       matrix:
         preset: ["linux-debug", "linux-release", "linux-relwithdebinfo"]
     env:
-      LLVM_VERSION: 18
+      LLVM_VERSION: 20
       CMAKE_PRESET: ${{ matrix.preset }}
 
     steps:
@@ -38,7 +38,7 @@ jobs:
         uses: hendrikmuhs/[email protected]
         with:
           key: ccache-${{ runner.os }}-${{ matrix.preset }}
-  
+
       - name: Cache vcpkg
         uses: actions/cache@v4
         with:
@@ -52,7 +52,7 @@ jobs:
       - name: Install Dependencies (Linux)
         run: |-
           sudo apt update
-          sudo apt install -y ninja-build llvm-${{ env.LLVM_VERSION }}-dev libgtk-3-dev
+          sudo apt install -y ninja-build clang-${{ env.LLVM_VERSION }} libgtk-3-dev
 
       - name: Cache ccache Directory
         uses: actions/cache@v4
@@ -62,11 +62,11 @@ jobs:
 
       - name: Prepare Project
         run: cp ./private/* ./UnleashedRecompLib/private
-  
+
       - name: Configure Project
         env:
           CCACHE_DIR: /tmp/ccache
-        run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
+        run: PATH="/usr/lib/llvm-${{ env.LLVM_VERSION }}/bin:$PATH" cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
 
       - name: Build Project
         env:
@@ -119,7 +119,7 @@ jobs:
         run: |
           choco install ninja
           Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-      
+
       - name: Configure Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1
 
@@ -134,7 +134,7 @@ jobs:
 
       - name: Build Project
         run: cmake --build .\out\build\${{ env.CMAKE_PRESET }} --target UnleashedRecomp
-      
+
       - name: Pack Release
         run: |
           New-Item -ItemType Directory -Path .\release
@@ -162,8 +162,6 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       FLATPAK_ID: io.github.hedge_dev.unleashedrecomp
-      FREEDESKTOP_VERSION: 23.08
-      LLVM_VERSION: 18
 
     steps:
       - name: Checkout Repository
@@ -190,13 +188,11 @@ jobs:
           key: ccache-${{ runner.os }}
 
       - name: Prepare Project
-        run: cp ./private/* ./UnleashedRecompLib/private  
+        run: cp ./private/* ./UnleashedRecompLib/private
 
       - name: Prepare Flatpak
         run: |
           flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak --user install -y flathub org.freedesktop.Sdk//${{ env.FREEDESKTOP_VERSION }}
-          flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm${{ env.LLVM_VERSION }}//${{ env.FREEDESKTOP_VERSION }}
 
       - name: Build Flatpak
         run: |

flatpak/io.github.hedge_dev.unleashedrecomp.json

@@ -1,9 +1,9 @@
 {
   "id": "io.github.hedge_dev.unleashedrecomp",
   "runtime": "org.freedesktop.Platform",
-  "runtime-version": "23.08",
+  "runtime-version": "25.08",
   "sdk": "org.freedesktop.Sdk",
-  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm18" ],
+  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm20" ],
   "finish-args": [
     "--share=network",
     "--socket=wayland",
@@ -35,8 +35,8 @@
         }
       ],
       "build-options": {
-        "append-path": "/usr/lib/sdk/llvm18/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
+        "append-path": "/usr/lib/sdk/llvm20/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm20/lib",
         "build-args": [
           "--share=network"
         ]