CI: rename the "Linux32" job to lower-case "linux32"

As a follow-up to the preceding commit's shortening of CI job names,
rename the only job that starts with an upper-case letter to be
consistent with the rest. It was added in 88dedd5e72c (Travis: also
test on 32-bit Linux, 2017-03-05).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c7c104565728035308d64f8daf1b8decc1f88413..91b565f75bb13df69c822fcabf1a6fb041c0de10 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -266,7 +266,8 @@ jobs:
         vector:
         - jobname: linux-musl
           image: alpine
-        - jobname: Linux32
+        - jobname: linux32
+          os: ubuntu32
           image: daald/ubuntu32:xenial
         - jobname: pedantic
           image: fedora

diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh
index 07a8c6b199d39cc1df0e1a2bd739c49820741fd0..78b7e326da6d8b6b3d1923007d3f22dea9814b8d 100755 (executable)
--- a/ci/install-docker-dependencies.sh
+++ b/ci/install-docker-dependencies.sh
@@ -4,7 +4,7 @@
 #
 
 case "$jobname" in
-Linux32)
+linux32)
        linux32 --32bit i386 sh -c '
                apt update >/dev/null &&
                apt install -y build-essential libcurl4-openssl-dev \

diff --git a/ci/lib.sh b/ci/lib.sh
index 73d959e87f7500328b98249d32c72e660b0369e3..0b3b01448829ca705984da1a7e369f49d3b7f7dc 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -191,7 +191,7 @@ osx-clang|osx-gcc)
        ;;
 linux-gcc-default)
        ;;
-Linux32)
+linux32)
        CC=gcc
        ;;
 linux-musl)

diff --git a/ci/run-docker-build.sh b/ci/run-docker-build.sh
index 5d2764ad3a3755e12d7b307c69b6727dc712cac8..6cd832efb9cb59687fac4cf95bf471bc87923a96 100755 (executable)
--- a/ci/run-docker-build.sh
+++ b/ci/run-docker-build.sh
@@ -15,7 +15,7 @@ then
 fi
 
 case "$jobname" in
-Linux32)
+linux32)
        switch_cmd="linux32 --32bit i386"
        ;;
 linux-musl)

diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index b610dd4db84a3011ba7b5f8db744d598bc0b5b20..af89d1624a41cbe3e51e6c10d65f72082266c490 100755 (executable)
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -6,7 +6,7 @@
 . ${0%/*}/lib.sh
 
 case "$jobname" in
-Linux32)
+linux32)
        CI_CONTAINER="daald/ubuntu32:xenial"
        ;;
 linux-musl)