From 734f974753571310fdf6c73ba38f17362dcf71ba Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Wed, 22 Jan 2025 17:04:43 +0100 Subject: [PATCH] CMake: Re-enable Cygwin tests without Ninja. --- .github/workflows/msys-cygwin.yml | 62 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml index 276959b3..4f5018c7 100644 --- a/.github/workflows/msys-cygwin.yml +++ b/.github/workflows/msys-cygwin.yml @@ -40,35 +40,33 @@ jobs: - name: Run tests run: ctest --output-on-failure --test-dir build -C Release -# cygwin: -# strategy: -# fail-fast: false -# runs-on: windows-latest -# defaults: -# run: -# shell: C:\cygwin\bin\bash.exe --login -o igncr '{0}' -# name: Cygwin -# steps: -# - name: Checkout -# uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# - name: Setup cygwin -# uses: cygwin/cygwin-install-action@master -# with: -# packages: >- -# cmake -# cygwin-devel -# gcc-core -# gcc-g++ -# ninja -# - name: Configure -# run: | -# cmake /cygdrive/d/a/zlib/zlib \ -# -B build \ -# -DCMAKE_BUILD_TYPE=Release \ -# -G Ninja -# - name: Build -# run: cmake --build build --config Release -# - name: Run tests -# run: ctest --output-on-failure --test-dir build -C Release + cygwin: + strategy: + fail-fast: false + runs-on: windows-latest + defaults: + run: + shell: C:\cygwin\bin\bash.exe --login -o igncr '{0}' + name: Cygwin + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup cygwin + uses: cygwin/cygwin-install-action@master + with: + packages: >- + cmake + cygwin-devel + gcc-core + gcc-g++ + - name: Configure + run: | + cmake /cygdrive/d/a/zlib/zlib \ + -B build \ + -DCMAKE_BUILD_TYPE=Release + - name: Build + run: cmake --build build --config Release + - name: Run tests + run: ctest --output-on-failure --test-dir build -C Release