diff --git a/.appveyor.yml b/.appveyor.yml index c58911cc..cc33ce5a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,12 +9,6 @@ branches: skip_tags: true environment: matrix: - - GENERATOR: MinGW Makefiles - BUILD_SHARED_LIBS: ON - CFLAGS: -Werror - - GENERATOR: MinGW Makefiles - BUILD_SHARED_LIBS: OFF - CFLAGS: -Werror - GENERATOR: Visual Studio 12 2013 BUILD_SHARED_LIBS: ON CFLAGS: /WX @@ -24,14 +18,6 @@ environment: matrix: fast_finish: true for: -- - matrix: - only: - - GENERATOR: MinGW Makefiles - build_script: - - set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin% - - cmake -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% - - cmake --build build - matrix: only: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ef9ed79..774ce25f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,6 +74,29 @@ jobs: - name: Build Cocoa shared library run: cmake --build build-cocoa-shared --parallel + build-mingw: + name: Windows (MINGW) + runs-on: windows-latest + timeout-minutes: 4 + strategy: + matrix: + BUILD_SHARED_LIBS: [ ON, OFF ] + defaults: + run: + # Use MinGW environment + shell: bash + env: + CFLAGS: -Werror + CMAKE_GENERATOR: MinGW Makefiles + steps: + - uses: actions/checkout@v4 + - name: Configure MINGW library + run: cmake -B build -DBUILD_SHARED_LIBS=${{matrix.BUILD_SHARED_LIBS}} + - name: Build MINGW library + run: cmake --build build --parallel + - name: Install MINGW library to /tmp + run: cmake --install build --prefix /tmp + build-windows-vs2022: name: Windows (VS2022) runs-on: windows-latest