From 2a9b6833f1f7b06f37963992e78a5423426dd260 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 12 Jul 2025 14:02:02 +0200
Subject: [PATCH] ci: use private setup-ninja action
---
.github/actions/setup-ninja/action.yml | 2 +-
.github/workflows/main.yml | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.github/actions/setup-ninja/action.yml b/.github/actions/setup-ninja/action.yml
index b5d5fad06..690c248cc 100644
--- a/.github/actions/setup-ninja/action.yml
+++ b/.github/actions/setup-ninja/action.yml
@@ -3,7 +3,7 @@ description: 'Download ninja and add it to the PATH environment variable'
inputs:
version:
description: 'Ninja version'
- default: '1.12.1'
+ default: '1.13.1'
runs:
using: 'composite'
steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 522a12924..a3e6986be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,9 +47,6 @@ jobs:
${{ matrix.platform.msys-env }}-ninja
${{ matrix.platform.msys-env }}-perl
${{ matrix.platform.msys-env }}-pkg-config
- - name: Set up Ninja
- uses: aseprite/get-ninja@main
- if: ${{ !contains(matrix.platform.shell, 'msys2') }}
- name: Set up SDL
id: sdl
uses: libsdl-org/setup-sdl@main
@@ -63,7 +60,6 @@ jobs:
run: |
brew install \
libtool \
- ninja \
flac \
fluidsynth \
game-music-emu \
@@ -94,6 +90,9 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
+ - name: Set up ninja
+ uses: ./.github/actions/setup-ninja
+ if: ${{ matrix.platform.shell == 'msys2 {0}' }}
- name: Check that versioning is consistent
# We only need to run this once: arbitrarily use the Linux build