Skip to content

Commit 2d65e5b

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 19981da commit 2d65e5b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ jobs:
303303
CC: ${{matrix.vector.cc}}
304304
CC_PACKAGE: ${{matrix.vector.cc_package}}
305305
jobname: ${{matrix.vector.jobname}}
306-
runs_on_pool: ${{matrix.vector.pool}}
306+
distro: ${{matrix.vector.pool}}
307307
runs-on: ${{matrix.vector.pool}}
308308
steps:
309309
- uses: actions/checkout@v4

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
1111
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
1212
libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
1313

14-
case "$runs_on_pool" in
14+
case "$distro" in
1515
ubuntu-*)
1616
sudo apt-get -q update
1717
sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \

ci/lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ then
279279

280280
cache_dir="$HOME/none"
281281

282-
runs_on_pool=$(echo "$CI_JOB_IMAGE" | tr : -)
282+
distro=$(echo "$CI_JOB_IMAGE" | tr : -)
283283
JOBS=$(nproc)
284284
else
285285
echo "Could not identify CI type" >&2
@@ -318,7 +318,7 @@ export DEFAULT_TEST_TARGET=prove
318318
export GIT_TEST_CLONE_2GB=true
319319
export SKIP_DASHED_BUILT_INS=YesPlease
320320

321-
case "$runs_on_pool" in
321+
case "$distro" in
322322
ubuntu-*)
323323
if test "$jobname" = "linux-gcc-default"
324324
then

0 commit comments

Comments
 (0)