From c40e17388afd528b7411bf2f109b9242108564e1 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:56:41 +1000 Subject: [PATCH] Install newer CMake due to regression in 3.29.1 causing issues --- .github/workflows/build_linux.yml | 8 ++++++-- .github/workflows/build_macos.yml | 6 ++++-- .github/workflows/build_windows.yml | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 48302b8..307b30f 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -20,8 +20,12 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install -y pkg-config ninja-build \ - libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsdl2-dev + sudo apt-get install -y pkg-config libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsdl2-dev + + - name: Install CMake & Ninja + uses: lukka/get-cmake@latest + with: + cmakeVersion: 3.29.2 - uses: actions/checkout@v4 with: diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 9f5d16a..d1de33c 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -21,8 +21,10 @@ jobs: with: submodules: 'recursive' - - name: Hire a Ninja - run: brew install ninja + - name: Install CMake & Ninja + uses: lukka/get-cmake@latest + with: + cmakeVersion: 3.29.2 - name: sccache uses: hendrikmuhs/ccache-action@v1.2 diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index f537509..6d726f4 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -22,10 +22,10 @@ jobs: with: submodules: 'recursive' - - name: Hire a Ninja - run: | - choco install ninja - ninja.exe --version + - name: Install CMake & Ninja + uses: lukka/get-cmake@latest + with: + cmakeVersion: 3.29.2 - name: sccache uses: hendrikmuhs/ccache-action@v1.2