Move VS 2019 builds from AppVeyor to GH Actions

GitHub runners unfortunately do not come with MinGW or VS 2010
pre-installed, so moving those builds will be more involved.  MinGW-w64
is not a good replacement for MinGW as it is far more complete.

This gives at least some feedback for all supported platforms via the
GitHub Actions system.
This commit is contained in:
Camilla Löwy 2021-06-09 16:44:45 +02:00
parent 5a6001a83b
commit 4e788fc6dc
2 changed files with 30 additions and 19 deletions

View File

@ -1,6 +1,5 @@
image: image:
- Visual Studio 2015 - Visual Studio 2015
- Visual Studio 2019
branches: branches:
only: only:
- ci - ci
@ -21,26 +20,13 @@ environment:
- GENERATOR: Visual Studio 10 2010 - GENERATOR: Visual Studio 10 2010
BUILD_SHARED_LIBS: OFF BUILD_SHARED_LIBS: OFF
CFLAGS: /WX CFLAGS: /WX
- GENERATOR: Visual Studio 16 2019
BUILD_SHARED_LIBS: ON
CFLAGS: /WX
- GENERATOR: Visual Studio 16 2019
BUILD_SHARED_LIBS: OFF
CFLAGS: /WX
matrix: matrix:
fast_finish: true fast_finish: true
exclude:
- image: Visual Studio 2015
GENERATOR: Visual Studio 16 2019
- image: Visual Studio 2019
GENERATOR: Visual Studio 10 2010
- image: Visual Studio 2019
GENERATOR: MinGW Makefiles
for: for:
- -
matrix: matrix:
except: only:
- GENERATOR: Visual Studio 10 2010 - GENERATOR: MinGW Makefiles
build_script: build_script:
- set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin% - set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin%
- cmake -S . -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% - cmake -S . -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%

View File

@ -6,14 +6,14 @@ on:
permissions: permissions:
statuses: write statuses: write
contents: read contents: read
env:
CC: clang
CFLAGS: -Werror
jobs: jobs:
build-linux-x11-clang: build-linux-x11-clang:
name: X11 (Linux, Clang) name: X11 (Linux, Clang)
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
CC: clang
CFLAGS: -Werror
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
@ -34,6 +34,9 @@ jobs:
build-linux-wayland-clang: build-linux-wayland-clang:
name: Wayland (Linux, Clang) name: Wayland (Linux, Clang)
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
CC: clang
CFLAGS: -Werror
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
@ -54,6 +57,9 @@ jobs:
build-linux-null-clang: build-linux-null-clang:
name: Null (Linux, Clang) name: Null (Linux, Clang)
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
CC: clang
CFLAGS: -Werror
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
@ -75,6 +81,7 @@ jobs:
name: Cocoa (macOS, Clang) name: Cocoa (macOS, Clang)
runs-on: macos-latest runs-on: macos-latest
env: env:
CFLAGS: -Werror
MACOSX_DEPLOYMENT_TARGET: 10.8 MACOSX_DEPLOYMENT_TARGET: 10.8
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -89,3 +96,21 @@ jobs:
- name: Build shared library - name: Build shared library
run: cmake --build build-shared --parallel run: cmake --build build-shared --parallel
build-windows-win32-vs2019:
name: Win32 (Windows, VS2019)
runs-on: windows-latest
env:
CFLAGS: /WX
steps:
- uses: actions/checkout@v2
- name: Configure static library
run: cmake -S . -B build-static -G "Visual Studio 16 2019"
- name: Build static library
run: cmake --build build-static --parallel
- name: Configure shared library
run: cmake -S . -B build-shared -G "Visual Studio 16 2019" -D BUILD_SHARED_LIBS=ON
- name: Build shared library
run: cmake --build build-shared --parallel