ci: rename "runs_on_pool" to "distro"

The "runs_on_pool" environment variable is used by our CI scripts to
distinguish the different kinds of operating systems. It is quite
specific to GitHub Actions though and not really a descriptive name.

Rename the variable to "distro" to clarify its intent.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3428773b096e9ea0da0488b9d75171f09b7ca961..684ef5c00d142b394fbb0d27846364c9ac600a4e 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -303,7 +303,7 @@ jobs:
       CC: ${{matrix.vector.cc}}
       CC_PACKAGE: ${{matrix.vector.cc_package}}
       jobname: ${{matrix.vector.jobname}}
-      runs_on_pool: ${{matrix.vector.pool}}
+      distro: ${{matrix.vector.pool}}
     runs-on: ${{matrix.vector.pool}}
     steps:
     - uses: actions/checkout@v4

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index b4e22de3cb9c351098cc57105c12e6242d1a4384..7d247b5ef4ada27fe81ad4290501fbf78015664d 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -11,7 +11,7 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
  tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
  libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
 
-case "$runs_on_pool" in
+case "$distro" in
 ubuntu-*)
        sudo apt-get -q update
        sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \

diff --git a/ci/lib.sh b/ci/lib.sh
index 0a73fc7bd1c2036afc3b7b9df169746133a8b537..d882250db55dc44df3253483aba9a6fc53e14f0e 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -279,7 +279,7 @@ then
 
        cache_dir="$HOME/none"
 
-       runs_on_pool=$(echo "$CI_JOB_IMAGE" | tr : -)
+       distro=$(echo "$CI_JOB_IMAGE" | tr : -)
        JOBS=$(nproc)
 else
        echo "Could not identify CI type" >&2
@@ -318,7 +318,7 @@ export DEFAULT_TEST_TARGET=prove
 export GIT_TEST_CLONE_2GB=true
 export SKIP_DASHED_BUILT_INS=YesPlease
 
-case "$runs_on_pool" in
+case "$distro" in
 ubuntu-*)
        if test "$jobname" = "linux-gcc-default"
        then