Skip to content

Commit 2a9b683

Browse files
committed
ci: use private setup-ninja action
1 parent 4b99bab commit 2a9b683

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/actions/setup-ninja/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: 'Download ninja and add it to the PATH environment variable'
33
inputs:
44
version:
55
description: 'Ninja version'
6-
default: '1.12.1'
6+
default: '1.13.1'
77
runs:
88
using: 'composite'
99
steps:

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ jobs:
4747
${{ matrix.platform.msys-env }}-ninja
4848
${{ matrix.platform.msys-env }}-perl
4949
${{ matrix.platform.msys-env }}-pkg-config
50-
- name: Set up Ninja
51-
uses: aseprite/get-ninja@main
52-
if: ${{ !contains(matrix.platform.shell, 'msys2') }}
5350
- name: Set up SDL
5451
id: sdl
5552
uses: libsdl-org/setup-sdl@main
@@ -63,7 +60,6 @@ jobs:
6360
run: |
6461
brew install \
6562
libtool \
66-
ninja \
6763
flac \
6864
fluidsynth \
6965
game-music-emu \
@@ -94,6 +90,9 @@ jobs:
9490
- uses: actions/checkout@v4
9591
with:
9692
submodules: recursive
93+
- name: Set up ninja
94+
uses: ./.github/actions/setup-ninja
95+
if: ${{ matrix.platform.shell == 'msys2 {0}' }}
9796

9897
- name: Check that versioning is consistent
9998
# We only need to run this once: arbitrarily use the Linux build

0 commit comments

Comments
 (0)