diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed3169e..3d91aba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] + os: [windows-2022, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] fail-fast: false steps: - name: Expose GitHub Runtime diff --git a/assimp b/assimp index 6a08c39..392a658 160000 --- a/assimp +++ b/assimp @@ -1 +1 @@ -Subproject commit 6a08c39e3a91ef385e76515cfad86aca4bfd57ff +Subproject commit 392a658f9c271be965271f45e7521a1b80ea4392 diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index c33892b..d554da8 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -12,8 +12,8 @@ public sealed class BuildLinuxTask : FrostingTask public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF CMakeLists.txt" }); - context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); + context.StartProcessWithDocker("cmake", workingDirectory: buildWorkingDir, args: "-DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DBUILD_SHARED_LIBS=ON CMakeLists.txt"); + context.StartProcessWithDocker("make", workingDirectory: buildWorkingDir, args: ""); context.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so"); } } diff --git a/buildscripts b/buildscripts index 43f13de..85bd209 160000 --- a/buildscripts +++ b/buildscripts @@ -1 +1 @@ -Subproject commit 43f13de8d1dd568f35eb9fe665fe4824e90a437d +Subproject commit 85bd2099140060dba373744e02282525aa8e876c