From e095285353e3c9492e1537980cfc1181439af68a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 5 Jul 2025 04:26:12 +0300 Subject: [PATCH 66/66] CI: Run rulesets_upgrade.sh test on meson build job See RM #1565 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 43248ddd5f..7d0ad576b7 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -57,6 +57,9 @@ if test "$FC_MESON_VER" != "" ; then cd .. fi +# Fetch S3_3 in the background for the ruleset upgrade test +git fetch --no-tags --quiet https://github.com/freeciv/freeciv.git S3_3:S3_3 & + mkdir build cd build meson setup .. \ @@ -83,6 +86,14 @@ echo "Checking ruleset saving" ninja rulesets_save.sh ./rulesets_save.sh +# Check ruleset upgrade +echo "Ruleset upgrade" +echo "Preparing test data" +../tests/rs_test_res/upgrade_ruleset_sync.bash +echo "Checking ruleset upgrade" +ninja rulesets_upgrade.sh +./rulesets_upgrade.sh + echo "Running Freeciv server autogame" cd ${HOME}/freeciv/meson/bin/ ./freeciv-server --Announce none -e -F --read ${basedir}/scripts/test-autogame.serv @@ -201,8 +212,6 @@ echo "Freeciv build successful!" ;; autotools) -# Fetch S3_3 in the background for the ruleset upgrade test -git fetch --no-tags --quiet https://github.com/freeciv/freeciv.git S3_3:S3_3 & # Configure and build Freeciv mkdir build @@ -227,13 +236,6 @@ make -s -j$(nproc) make install echo "Freeciv build successful!" -# Check ruleset upgrade -echo "Ruleset upgrade" -echo "Preparing test data" -../tests/rs_test_res/upgrade_ruleset_sync.bash -echo "Checking ruleset upgrade" -./tests/rulesets_upgrade.sh - # Check ruleset autohelp generation echo "Checking ruleset auto help generation" ./tests/rulesets_autohelp.sh -- 2.47.2