From fa4c585032bf8d87cbf1beeb209fd09600a1bae6 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 13 Jun 2025 08:23:53 +0300 Subject: [PATCH 104/104] CI: Rename 'normal' job as 'autotools' See RM #1499 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- scripts/ci-build.sh | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51ae6cdc88..26b72bf620 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: - name: build shell: bash run: ./scripts/ci-build.sh mac-meson - normal: + autotools: runs-on: ubuntu-24.04 steps: - name: check out Freeciv @@ -104,7 +104,7 @@ jobs: unixodbc-dev - name: build shell: bash - run: ./scripts/ci-build.sh normal + run: ./scripts/ci-build.sh autotools dist: runs-on: ubuntu-24.04 steps: diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 2b1e7d101a..cd4a0ad802 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -200,7 +200,7 @@ cd build 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 & @@ -238,4 +238,9 @@ echo "Checking ruleset upgrade" echo "Checking ruleset auto help generation" ./tests/rulesets_autohelp.sh ;; + +*) +echo "Unknown ci-job \"$1\"" >&2 +exit 1 +;; esac -- 2.47.2