0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI: Remove macOS and Windows debug job, add dedicated C++20 job

Browse source 
Also makes the windows build run on windows-latest and VS 2022
This commit is contained in:
Charles Dang 2024-08-31 11:56:48 -04:00 • committed by GitHub
parent f22fb410a3
commit 97abecb56c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/ci-main.yml vendored
View file

@ -54,8 +54,9 @@ jobs:
fail-fast: false
matrix:
include:
- { tool: scons, cc: gcc, cxx: g++, cfg: debug, lto: false, sys_lua: false }
- { tool: cmake, cc: clang, cxx: clang++, cfg: release, lto: true, sys_lua: true }
- { tool: scons, cc: gcc, cxx: g++, std: 17, cfg: debug, lto: false, sys_lua: false }
- { tool: cmake, cc: gcc, cxx: g++, std: 20, cfg: release, lto: true, sys_lua: false }
- { tool: cmake, cc: clang, cxx: clang++, std: 17, cfg: release, lto: true, sys_lua: true }
runs-on: ubuntu-latest
container:
image: wesnoth/wesnoth:2404-master
@ -65,7 +66,7 @@ jobs:
CFG: ${{ matrix.cfg }}
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
CXX_STD: 17
CXX_STD: ${{ matrix.std }}
LTO: ${{ matrix.lto }}
SYS_LUA: ${{ matrix.sys_lua }}
CLICOLOR_FORCE: 1
@ -249,7 +250,7 @@ jobs:
strategy:
fail-fast: false
matrix:
cfg: [ Debug, Release ]
cfg: [ Release ]
runs-on: macos-12
env:
CFG: ${{ matrix.cfg }}
@ -290,7 +291,7 @@ jobs:
strategy:
fail-fast: false
matrix:
cfg: [Debug, Release]
cfg: [Release]
env:
CFG: ${{ matrix.cfg }}
VCPKG_FEATURE_FLAGS: dependencygraph
@ -299,7 +300,7 @@ jobs:
defaults:
run:
shell: cmd
runs-on: windows-2019
runs-on: windows-latest
steps:
- { uses: actions/checkout@v4, with: { submodules: "recursive" } }
@ -322,7 +323,7 @@ jobs:
run: cmake -DCMAKE_BUILD_TYPE=%CFG% -DENABLE_GAME=true -DENABLE_SERVER=true -DENABLE_CAMPAIGN_SERVER=true
-DENABLE_TESTS=true -DENABLE_MYSQL=false -DENABLE_NLS=false
-DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_INSTALL_OPTIONS=--debug
-DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 16 2019" .
-DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 17 2022" .
- name: Build wesnoth, wesnothd, campaignd and unit tests
run: MSBuild.exe wesnoth.sln -p:Configuration=%CFG%