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
This commit is contained in:
4
.github/workflows/build_linux.yml
vendored
4
.github/workflows/build_linux.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
# Editor
|
# Editor
|
||||||
editor-linux:
|
editor-linux:
|
||||||
name: Editor (Linux, Development x64)
|
name: Editor (Linux, Development x64)
|
||||||
runs-on: "ubuntu-20.04"
|
runs-on: "ubuntu-24.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@@ -41,7 +41,7 @@ jobs:
|
|||||||
# Game
|
# Game
|
||||||
game-linux:
|
game-linux:
|
||||||
name: Game (Linux, Release x64)
|
name: Game (Linux, Release x64)
|
||||||
runs-on: "ubuntu-20.04"
|
runs-on: "ubuntu-24.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|||||||
4
.github/workflows/cd.yml
vendored
4
.github/workflows/cd.yml
vendored
@@ -76,7 +76,7 @@ jobs:
|
|||||||
# Linux
|
# Linux
|
||||||
package-linux-editor:
|
package-linux-editor:
|
||||||
name: Editor (Linux)
|
name: Editor (Linux)
|
||||||
runs-on: "ubuntu-20.04"
|
runs-on: "ubuntu-24.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@@ -110,7 +110,7 @@ jobs:
|
|||||||
path: Output/FlaxEditorLinux.zip
|
path: Output/FlaxEditorLinux.zip
|
||||||
package-linux-game:
|
package-linux-game:
|
||||||
name: Game (Linux)
|
name: Game (Linux)
|
||||||
runs-on: "ubuntu-20.04"
|
runs-on: "ubuntu-24.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|||||||
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
# Tests on Linux
|
# Tests on Linux
|
||||||
tests-linux:
|
tests-linux:
|
||||||
name: Tests (Linux)
|
name: Tests (Linux)
|
||||||
runs-on: "ubuntu-20.04"
|
runs-on: "ubuntu-24.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|||||||
BIN
Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a
(Stored with Git LFS)
vendored
BIN
Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a
(Stored with Git LFS)
vendored
Binary file not shown.
@@ -124,8 +124,9 @@ namespace Flax.Deps.Dependencies
|
|||||||
{
|
{
|
||||||
var envVars = new Dictionary<string, string>
|
var envVars = new Dictionary<string, string>
|
||||||
{
|
{
|
||||||
{ "CC", "clang-7" },
|
{ "CC", "clang-13" },
|
||||||
{ "CC_FOR_BUILD", "clang-7" }
|
{ "CC_FOR_BUILD", "clang-13" },
|
||||||
|
{ "CXX", "clang++-13" },
|
||||||
};
|
};
|
||||||
|
|
||||||
// Build for Linux
|
// Build for Linux
|
||||||
|
|||||||
Reference in New Issue
Block a user