Skip to content

Commit d66d178

Browse files
committed
ci: use private setup-ninja action
1 parent 7e7ef4d commit d66d178

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.github/workflows/main.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ jobs:
2424
- { name: Macos, os: macos-latest, shell: sh, vendored: false, cmake: '-DSDLIMAGE_DEPS_SHARED=OFF -GNinja', shared: 1, static: 0, artifact: 'SDL3_image-macos' }
2525

2626
steps:
27+
- uses: actions/checkout@v4
28+
with:
29+
submodules: ${{ matrix.platform.vendored && 'recursive' }}
30+
- name: Set up ninja
31+
if: ${{ !contains(matrix.platform.shell, 'msys2') }}
32+
uses: ./.github/actions/setup-ninja
2733

2834
- uses: ilammy/msvc-dev-cmd@v1
2935
if: ${{ matrix.platform.msvc }}
@@ -49,9 +55,6 @@ jobs:
4955
${{ matrix.platform.msys-env }}-libtiff
5056
${{ matrix.platform.msys-env }}-libwebp
5157
${{ matrix.platform.msys-env }}-zlib
52-
- name: Install Ninja
53-
uses: aseprite/get-ninja@main
54-
if: ${{ !contains(matrix.platform.shell, 'msys2') }}
5558
- name: Set up SDL
5659
id: sdl
5760
uses: libsdl-org/setup-sdl@main
@@ -84,10 +87,6 @@ jobs:
8487
uses: ilammy/setup-nasm@v1
8588
if: ${{ matrix.platform.vendored && !contains(matrix.platform.shell, 'msys2') }}
8689

87-
- uses: actions/checkout@v4
88-
with:
89-
submodules: ${{ matrix.platform.vendored && 'recursive' }}
90-
9190
- name: Check that versioning is consistent
9291
# We only need to run this once: arbitrarily use the Linux build
9392
if: ${{ runner.os == 'Linux' }}

0 commit comments

Comments
 (0)