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>
This commit is contained in:
Karthik Nayak
2025-03-19 17:33:28 +01:00
committed by Junio C Hamano
parent 683c54c999
commit ee89f7c79d

View File

@@ -349,6 +349,7 @@ jobs:
if: needs.ci-config.outputs.enabled == 'yes' if: needs.ci-config.outputs.enabled == 'yes'
env: env:
CC: clang CC: clang
CI_JOB_IMAGE: ubuntu-latest
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -432,6 +433,7 @@ jobs:
if: needs.ci-config.outputs.enabled == 'yes' if: needs.ci-config.outputs.enabled == 'yes'
env: env:
jobname: StaticAnalysis jobname: StaticAnalysis
CI_JOB_IMAGE: ubuntu-22.04
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
concurrency: concurrency:
group: static-analysis-${{ github.ref }} group: static-analysis-${{ github.ref }}
@@ -446,6 +448,7 @@ jobs:
if: needs.ci-config.outputs.enabled == 'yes' if: needs.ci-config.outputs.enabled == 'yes'
env: env:
jobname: sparse jobname: sparse
CI_JOB_IMAGE: ubuntu-20.04
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
concurrency: concurrency:
group: sparse-${{ github.ref }} group: sparse-${{ github.ref }}
@@ -473,6 +476,7 @@ jobs:
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
env: env:
jobname: Documentation jobname: Documentation
CI_JOB_IMAGE: ubuntu-latest
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4