From b30f0f7fa6f3144139febea65844b6e306ca3ee9 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 1 May 2024 22:11:06 +0200 Subject: [PATCH] ci: setup ninja through aseprite/get-ninja action --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf4c38c..6e61a87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,6 @@ jobs: brew install \ autoconf \ automake \ - ninja \ pkg-config \ sdl2 \ ${NULL+} @@ -58,7 +57,6 @@ jobs: automake \ cmake \ libsdl2-dev \ - ninja-build \ pkg-config \ ${NULL+} @@ -71,8 +69,8 @@ jobs: .github/fetch_sdl_vc.ps1 echo "SDL2_DIR=$Env:GITHUB_WORKSPACE/SDL2-devel-VC" >> $Env:GITHUB_ENV - name: Setup Ninja for MSVC - if: "matrix.platform.msvc" - uses: ashutoshvarma/setup-ninja@master + if: ${{ !contains(matrix.platform.shell, 'msys2') }} + uses: aseprite/get-ninja@main with: version: 1.10.2 - uses: ilammy/msvc-dev-cmd@v1