From dfb6b2f15f1f172f0fb4a08dba7932585d5229d1 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 22 Feb 2024 18:58:58 +0000 Subject: [PATCH] try to get more info --- .github/workflows/main.yml | 6 ++++++ build/BuildLinuxTask.cs | 2 +- build/BuildMacOSTask.cs | 2 +- build/BuildWindowsTask.cs | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 73693b8..1cf1285 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,12 @@ jobs: env: ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }} ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}" + - name: List + if: runner.os != 'Linux' + run: ls assimp + - name: List + if: runner.os == 'Windows' + run: dir assimp deploy: name: deploy runs-on: ubuntu-latest diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index 0d739bc..68e8606 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -12,7 +12,7 @@ public sealed class BuildLinuxTask : FrostingTask public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "CMakeLists.txt"}); + 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.CopyFile(@"assimp/bin/libassimp.so", $"{context.ArtifactsDir}/libassimp.so"); } diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index 6b71cef..497d23f 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 = "CMakeLists.txt"}); + 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.CopyFile(@"assimp/bin/libassimp.5.3.0.dylib", $"{context.ArtifactsDir}/libassimp.dylib"); } diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index e7b60b0..ade1720 100644 --- a/build/BuildWindowsTask.cs +++ b/build/BuildWindowsTask.cs @@ -13,7 +13,8 @@ public override void Run(BuildContext context) { var buildWorkingDir = "assimp/"; // Disable openmp so there is no dependency on VCOMP140.dll - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "CMakeLists.txt"}); + 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.CopyFile("assimp/bin/assimp.dll", $"{context.ArtifactsDir}/assimp.dll"); } }