From 7667ca55931302d8e35c37a46851eb02191d465f Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Tue, 31 Dec 2024 14:02:13 +0100 Subject: CMake: Re-enable Cygwin and MSYS tests. --- .github/workflows/msys-cygwin.txt | 74 --------------------------------------- .github/workflows/msys-cygwin.yml | 74 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 .github/workflows/msys-cygwin.txt create mode 100644 .github/workflows/msys-cygwin.yml (limited to '.github') diff --git a/.github/workflows/msys-cygwin.txt b/.github/workflows/msys-cygwin.txt deleted file mode 100644 index 5ad7a73..0000000 --- a/.github/workflows/msys-cygwin.txt +++ /dev/null @@ -1,74 +0,0 @@ -name: mingw/cygwin - -on: [push, pull_request] - -jobs: - MSys: - runs-on: windows-latest - strategy: - fail-fast: false - matrix: - sys: [mingw32, mingw64, ucrt64, clang64] - name: MSys - ${{ matrix.sys }} - defaults: - run: - shell: msys2 {0} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Setup MSYS2 - uses: msys2/setup-msys2@v2 - with: - msystem: ${{ matrix.sys }} - update: true - install: >- - make - pacboy: >- - toolchain:p - cmake:p - - name: Configure - run: | - cmake -G"Unix Makefiles" \ - -S . \ - -B build \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -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 - - 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 diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml new file mode 100644 index 0000000..5ad7a73 --- /dev/null +++ b/.github/workflows/msys-cygwin.yml @@ -0,0 +1,74 @@ +name: mingw/cygwin + +on: [push, pull_request] + +jobs: + MSys: + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + sys: [mingw32, mingw64, ucrt64, clang64] + name: MSys - ${{ matrix.sys }} + defaults: + run: + shell: msys2 {0} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup MSYS2 + uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.sys }} + update: true + install: >- + make + pacboy: >- + toolchain:p + cmake:p + - name: Configure + run: | + cmake -G"Unix Makefiles" \ + -S . \ + -B build \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -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 + + 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 -- cgit v1.2.3-55-g6feb