Simplify workflow

This commit is contained in:
Gunter Labes 2023-04-20 23:26:09 +02:00 committed by GitHub
parent 2a0638120f
commit 06045142c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -34,7 +34,6 @@ jobs:
CXX: ${{ matrix.cxx }}
CXX_STD: 17
LTO: ${{ matrix.lto }}
NLS: false
CLICOLOR_FORCE: 1
DISPLAY: :99.0
defaults:
@ -54,22 +53,19 @@ jobs:
scons wesnoth wesnothd campaignd boost_unit_tests \
build="$CFG" ctool="$CC" cxxtool="$CXX" cxx_std="$CXX_STD" \
extra_flags_config="-pipe" strict=true forum_user_handler=true \
nls="$NLS" enable_lto="$LTO" force_color=true jobs=2 --debug=time
nls=false enable_lto="$LTO" force_color=true jobs=2 --debug=time
;;
cmake)
cmake -DENABLE_GAME=true -DENABLE_SERVER=true -DENABLE_CAMPAIGN_SERVER=true \
-DENABLE_TESTS=true -DCMAKE_BUILD_TYPE="$CFG" -DCXX_STD="$CXX_STD" \
-DEXTRA_FLAGS_CONFIG="-pipe" -DENABLE_STRICT_COMPILATION=true -DENABLE_MYSQL=true \
-DENABLE_NLS="$NLS" -DFORCE_COLOR_OUTPUT=true -DENABLE_LTO="$LTO" -DLTO_JOBS=2 .
-DENABLE_NLS=false -DFORCE_COLOR_OUTPUT=true -DENABLE_LTO="$LTO" -DLTO_JOBS=2 .
make conftests
make VERBOSE=1 -j2
;;
esac
# - name: Rename debug binaries
# if: matrix.cfg == 'debug'
# run: mv wesnoth{-debug,}; mv wesnothd{-debug,}; mv campaignd{-debug,}; mv boost_unit_tests{-debug,}
- name: Start Xvfb
if: success() || failure()
if: steps.build.outcome == 'success'
run: start-stop-daemon --start --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24
- name: Whitespace and WML indentation check
if: success() || failure()
@ -83,19 +79,19 @@ jobs:
if: success() || failure()
run: ./utils/CI/doxygen-check.sh
- name: WML validation
if: success() || steps.build.outcome == 'success'
if: steps.build.outcome == 'success'
run: ./utils/CI/schema_validation.sh
- name: Run WML tests
if: success() || steps.build.outcome == 'success'
if: steps.build.outcome == 'success'
run: ./run_wml_tests -g -c -t 20
- name: Run play tests
if: success() || steps.build.outcome == 'success'
if: steps.build.outcome == 'success'
run: ./utils/CI/play_test_executor.sh
- name: Run MP tests
if: success() || steps.build.outcome == 'success'
if: steps.build.outcome == 'success'
run: ./utils/CI/mp_test_executor.sh
- name: Run unit tests
if: success() || steps.build.outcome == 'success'
if: steps.build.outcome == 'success'
run: ./run_boost_tests
steam-runtime: