diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f0eaef..48a74b6 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-20.04] + os: [windows-latest, macos-latest, ubuntu-22.04] fail-fast: false steps: - name: Expose GitHub Runtime diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index 62ea882..de9cbe8 100644 --- a/build/BuildMacOSTask.cs +++ b/build/BuildMacOSTask.cs @@ -12,7 +12,7 @@ public sealed class BuildMacOSTask : 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 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_INSTALL=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" CMakeLists.txt" }); context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); var files = Directory.GetFiles(System.IO.Path.Combine(buildWorkingDir, "bin"), "libassimp.*.*.*.dylib", SearchOption.TopDirectoryOnly); context.CopyFile(files[0], $"{context.ArtifactsDir}/libassimp.dylib");