Skip to content

Commit ee89f7c

Browse files
KarthikNayakgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 683c54c commit ee89f7c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ jobs:
349349
if: needs.ci-config.outputs.enabled == 'yes'
350350
env:
351351
CC: clang
352+
CI_JOB_IMAGE: ubuntu-latest
352353
runs-on: ubuntu-latest
353354
steps:
354355
- uses: actions/checkout@v4
@@ -432,6 +433,7 @@ jobs:
432433
if: needs.ci-config.outputs.enabled == 'yes'
433434
env:
434435
jobname: StaticAnalysis
436+
CI_JOB_IMAGE: ubuntu-22.04
435437
runs-on: ubuntu-22.04
436438
concurrency:
437439
group: static-analysis-${{ github.ref }}
@@ -446,6 +448,7 @@ jobs:
446448
if: needs.ci-config.outputs.enabled == 'yes'
447449
env:
448450
jobname: sparse
451+
CI_JOB_IMAGE: ubuntu-20.04
449452
runs-on: ubuntu-20.04
450453
concurrency:
451454
group: sparse-${{ github.ref }}
@@ -473,6 +476,7 @@ jobs:
473476
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
474477
env:
475478
jobname: Documentation
479+
CI_JOB_IMAGE: ubuntu-latest
476480
runs-on: ubuntu-latest
477481
steps:
478482
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)