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>

Patrick Steinhardt committed Apr 12, 2024 at 06:43 UTC 2d65e5b6a624e9642c4d765a861cf291095adc72
3 files changed +4 -4
.github/workflows/main.yml
+1 -1
@@ -303,7 +303,7 @@ jobs:
303 CC: ${{matrix.vector.cc}}
304 CC_PACKAGE: ${{matrix.vector.cc_package}}
305 jobname: ${{matrix.vector.jobname}}
306 - runs_on_pool: ${{matrix.vector.pool}}
306 + distro: ${{matrix.vector.pool}}
307 runs-on: ${{matrix.vector.pool}}
308 steps:
309 - uses: actions/checkout@v4
ci/install-dependencies.sh
+1 -1
@@ -11,7 +11,7 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
11 tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
12 libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
13
14 -case "$runs_on_pool" in
14 +case "$distro" in
15 ubuntu-*)
16 sudo apt-get -q update
17 sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
ci/lib.sh
+2 -2
@@ -279,7 +279,7 @@ then
279
280 cache_dir="$HOME/none"
281
282 - runs_on_pool=$(echo "$CI_JOB_IMAGE" | tr : -)
282 + distro=$(echo "$CI_JOB_IMAGE" | tr : -)
283 JOBS=$(nproc)
284 else
285 echo "Could not identify CI type" >&2
@@ -318,7 +318,7 @@ export DEFAULT_TEST_TARGET=prove
318 export GIT_TEST_CLONE_2GB=true
319 export SKIP_DASHED_BUILT_INS=YesPlease
320
321 -case "$runs_on_pool" in
321 +case "$distro" in
322 ubuntu-*)
323 if test "$jobname" = "linux-gcc-default"
324 then