From 0d022ee090c2b078e34806a69733cdea8c9d8456 Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 26 Apr 2024 16:06:01 -0300 Subject: [PATCH] Try to use aseprite/get-ninja GitHub action in workflows --- .github/workflows/build.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b89b344..80f7894 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,18 +10,11 @@ jobs: enable_image: [on, off] steps: - uses: actions/checkout@v4 + - uses: aseprite/get-ninja@ci - uses: ilammy/msvc-dev-cmd@v1 if: runner.os == 'Windows' - name: Generating Makefiles - shell: bash - run: | - if [[ "${{ runner.os }}" == "Windows" ]] ; then - cmake . -G "NMake Makefiles" \ - -DCLIP_ENABLE_IMAGE=${{ matrix.enable_image }} - else - cmake . -G "Unix Makefiles" \ - -DCLIP_ENABLE_IMAGE=${{ matrix.enable_image }} - fi + run: cmake . -G "Ninja" -DCLIP_ENABLE_IMAGE=${{ matrix.enable_image }} - name: Compiling shell: bash run: cmake --build . @@ -41,11 +34,12 @@ jobs: run: shell: msys2 {0} steps: + - uses: aseprite/get-ninja@main - uses: msys2/setup-msys2@v2 with: release: false msystem: ${{matrix.sys}} - pacboy: cc:p cmake:p ninja:p + pacboy: cc:p cmake:p - uses: actions/checkout@v4 - name: Generating Makefiles run: cmake .