From e6f17440bbba9366eeaa03afd3169b56835eb5a8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Feb 2023 17:42:31 +0200 Subject: [PATCH 5/5] CI: Fetch compat rulesets from S3_2 See osdn #47398 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 4 ++-- tests/rs_test_res/upgrade_ruleset_sync.bash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index aff8f0b31e..0be51f2a69 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -169,8 +169,8 @@ echo "Freeciv build successful!" ;; *) -# Fetch S3_1 in the background for the ruleset upgrade test -git fetch --no-tags --quiet https://github.com/freeciv/freeciv.git S3_1:S3_1 & +# Fetch S3_2 in the background for the ruleset upgrade test +git fetch --no-tags --quiet https://github.com/freeciv/freeciv.git S3_2:S3_2 & # Configure and build Freeciv mkdir build diff --git a/tests/rs_test_res/upgrade_ruleset_sync.bash b/tests/rs_test_res/upgrade_ruleset_sync.bash index 53ae958b87..b9a33746af 100755 --- a/tests/rs_test_res/upgrade_ruleset_sync.bash +++ b/tests/rs_test_res/upgrade_ruleset_sync.bash @@ -1,10 +1,10 @@ #!/bin/bash -# the revision from the old branch to pick if no revision is specified +# The revision from the old branch to pick if no revision is specified DEFAULT_REVISION="7c0d610bf8" -# the branch of the previous version -PREVIOUS_BRANCH="S3_1" +# The branch of the previous version +PREVIOUS_BRANCH="S3_2" set -e -- 2.39.1