From b37ba9279ee71c5565d291d7b80692ef248042e9 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 10 Oct 2024 22:51:59 +0200
Subject: [PATCH] Update Assimp for Linux (use clang 13)

Migrate to Ubuntu 24 for CI/CD builds
CLang 7 used before is no longer avaliable on latest Ubuntu distro
---
 .github/workflows/build_linux.yml                          | 4 ++--
 .github/workflows/cd.yml                                   | 4 ++--
 .github/workflows/tests.yml                                | 2 +-
 Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a | 4 ++--
 Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs        | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index b3348c288..d65662673 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -10,7 +10,7 @@ jobs:
   # Editor
   editor-linux:
     name: Editor (Linux, Development x64)
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
   # Game
   game-linux:
     name: Game (Linux, Release x64)
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index d83b40363..bb9fe3e6a 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -76,7 +76,7 @@ jobs:
   # Linux
   package-linux-editor:
     name: Editor (Linux)
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
@@ -110,7 +110,7 @@ jobs:
         path: Output/FlaxEditorLinux.zip
   package-linux-game:
     name: Game (Linux)
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e36642cdf..2242a546c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
   # Tests on Linux
   tests-linux:
     name: Tests (Linux)
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a
index 8680fe1af..92b3c5545 100644
--- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a
+++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc6f4d94de6fccc854c5ec2cfc98b6516391448f92e9a1ecab6b24709e0c6f87
-size 10378226
+oid sha256:b3510d6c5585f08fc9fcbf2044bb0dc0238e2501c1914e3b98aef36bc8cd2711
+size 10303430
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
index 307f0e309..652bbccb9 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
@@ -124,8 +124,9 @@ namespace Flax.Deps.Dependencies
                 {
                     var envVars = new Dictionary<string, string>
                     {
-                        { "CC", "clang-7" },
-                        { "CC_FOR_BUILD", "clang-7" }
+                        { "CC", "clang-13" },
+                        { "CC_FOR_BUILD", "clang-13" },
+                        { "CXX", "clang++-13" },
                     };
 
                     // Build for Linux