From 2d4d82d4690b5d8bd244f1c2de6c2a88ac89c4a7 Mon Sep 17 00:00:00 2001 From: Jeod <47716344+JeodC@users.noreply.github.com> Date: Fri, 19 Apr 2024 07:13:19 -0400 Subject: [PATCH] Accurately find the linux artifacts (#80) use ninja for Linux builds, fixes missing Linux artifacts on CI --- .github/workflows/build.yml | 2 +- CMakePresets.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbbda217c..e1de55b95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: sudo dpkg --add-architecture i386 sudo apt update sudo apt install -y --no-install-recommends \ - make cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev \ + ninja-build make cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev \ libxext6:i386 # for ./scripts/hogutils/hogUtils-i686 binary mkdir ~/Descent3 diff --git a/CMakePresets.json b/CMakePresets.json index bd61e25bb..436843d47 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -26,6 +26,7 @@ } , { "name": "linux" + , "generator": "Ninja Multi-Config" , "condition": { "type": "equals" , "lhs": "${hostSystemName}"