diff options
| author | briaguya <70942617+briaguya0@users.noreply.github.com> | 2026-07-22 20:59:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-22 20:59:03 -0400 |
| commit | cd33252589a61d044138f449041a87adee2a8291 (patch) | |
| tree | ba10b70a3af3fc97d4dd90865cf7ea27ac68954e /.github | |
| parent | 205bd3e8be07df1544d7938ae8f5827f5d90b77f (diff) | |
fix ci (#232)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux_build.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows_build.yml | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index f5f35c7..ecb1624 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -25,10 +25,10 @@ jobs: run: | sudo apt-get update # Base build tools plus the libultraship/Fast3D deps the interactive - # viewer (BUILD_UI) needs: SDL2, OpenGL, libzip and nlohmann-json. - # (tinyxml2 and spdlog are vendored via FetchContent.) + # viewer (BUILD_UI) needs: SDL2, OpenGL, libzip, nlohmann-json and spdlog. + # (tinyxml2 is vendored via FetchContent.) sudo apt-get install -y cmake ninja-build libbz2-dev \ - libsdl2-dev libgl1-mesa-dev libopengl-dev libzip-dev nlohmann-json3-dev + libsdl2-dev libgl1-mesa-dev libopengl-dev libzip-dev zipcmp zipmerge ziptool libspdlog-dev nlohmann-json3-dev - name: Build run: | # Enable the viewer in CI (BUILD_UI is off by default); both Linux diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d69d6dc..c32ef9e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: sudo apt-get update # Includes the libultraship/Fast3D deps for the interactive viewer. sudo apt-get install -y cmake ninja-build libbz2-dev \ - libsdl2-dev libgl1-mesa-dev libopengl-dev libzip-dev nlohmann-json3-dev + libsdl2-dev libgl1-mesa-dev libopengl-dev libzip-dev zipcmp zipmerge ziptool libspdlog-dev nlohmann-json3-dev - name: Configure and Build Linux Binaries run: | diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 6a21f3a..3daccd3 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -22,6 +22,8 @@ jobs: exclude: - toolchain: windows-clang-cl arch: Win32 + - toolchain: windows-clang-cl + generate: Visual Studio 17 2022 - isPR: true standalone: OFF steps: |