From 3e9274725b9f94dede59094ea3473230a4c18786 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 9 Jan 2021 00:50:57 +0200 Subject: [PATCH 5/5] CI: Fetch compat rulesets from S3_1 See osdn #41127 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 4 ++-- tests/rs_test_res/upgrade_ruleset_sync.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 5eb52fb75f..d47944598f 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -86,8 +86,8 @@ make install ;; *) -# Fetch S3_0 in the background for the ruleset upgrade test -git fetch --no-tags --quiet https://github.com/freeciv/freeciv.git S3_0:S3_0 & +# 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 & # 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 58cdc98622..db90bb5d77 100755 --- a/tests/rs_test_res/upgrade_ruleset_sync.bash +++ b/tests/rs_test_res/upgrade_ruleset_sync.bash @@ -4,7 +4,7 @@ DEFAULT_REVISION="dbc31c25" # the branch of the previous version -PREVIOUS_BRANCH="S3_0" +PREVIOUS_BRANCH="S3_1" set -e -- 2.29.2