From db7ea040b1a5684c674c6c7be157f5c3d52a6445 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Wed, 1 May 2024 22:21:08 +0200
Subject: [PATCH] ci: setup ninja through aseprite/get-ninja action
(cherry picked from commit 98b0a2d92f038e505eb877d5b4dc676ba42de5e5)
---
.github/workflows/main.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 202833d5..cec93b70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,7 +55,6 @@ jobs:
autoconf \
automake \
libtool \
- ninja \
pkg-config \
flac \
fluidsynth \
@@ -83,7 +82,6 @@ jobs:
libvorbis-dev \
libxmp-dev \
libwavpack-dev \
- ninja-build \
pkg-config \
${NULL+}
- uses: actions/checkout@v3
@@ -103,10 +101,8 @@ jobs:
echo "${{ github.workspace }}" >> $Env:GITHUB_PATH
echo "::endgroup::"
- name: Setup Ninja for MSVC
- if: "matrix.platform.msvc"
- uses: ashutoshvarma/setup-ninja@master
- with:
- version: 1.10.2
+ if: ${{ !contains(matrix.platform.shell, 'msys2') }}
+ uses: aseprite/get-ninja@main
- uses: ilammy/msvc-dev-cmd@v1
if: "matrix.platform.msvc"
with: