@matheusbsbs / matheus-bagliano / commits / ee89f7c79d

ci/github: add missing 'CI_JOB_IMAGE' env variable

The CI setups of GitLab and GitHub use a common dependency management script 'ci/install-dependencies.sh'. The script install the necessary packages based on a combination of the "$distro" and "$jobname" env variables. The "$distro" variable is derived from the "CI_JOB_IMAGE" env variable set by the CI configs. In the GitHub CI config, some of the jobs are missing this variable. For the 'Documentation' job which depends on 'meson' being installed, this raises an error since the 'meson' dependency is never installed. Fix this by adding the 'CI_JOB_IMAGE' variable to all missing jobs. We don't add it the windows jobs, since they manager their dependency as part of the CI config and no further dependency management is needed. Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Karthik Nayak committed Mar 19, 2025 at 17:33 UTC ee89f7c79ddb1193c57b67bd7e258ca88a5e87cc

1 file changed +4

.github/workflows/main.yml

@@ -349,6 +349,7 @@ jobs:

349 if: needs.ci-config.outputs.enabled == 'yes'

350 env:

351 CC: clang

352 + CI_JOB_IMAGE: ubuntu-latest

353 runs-on: ubuntu-latest

354 steps:

355 - uses: actions/checkout@v4

@@ -432,6 +433,7 @@ jobs:

433 if: needs.ci-config.outputs.enabled == 'yes'

434 env:

435 jobname: StaticAnalysis

436 + CI_JOB_IMAGE: ubuntu-22.04

437 runs-on: ubuntu-22.04

438 concurrency:

439 group: static-analysis-${{ github.ref }}

@@ -446,6 +448,7 @@ jobs:

448 if: needs.ci-config.outputs.enabled == 'yes'

449 env:

450 jobname: sparse

451 + CI_JOB_IMAGE: ubuntu-20.04

452 runs-on: ubuntu-20.04

453 concurrency:

454 group: sparse-${{ github.ref }}

@@ -473,6 +476,7 @@ jobs:

476 cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}

477 env:

478 jobname: Documentation

479 + CI_JOB_IMAGE: ubuntu-latest

480 runs-on: ubuntu-latest

481 steps:

482 - uses: actions/checkout@v4