admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kn/ci-meson-check-build-docs-fix'

Browse Source 
GitHub Actions CI switched on a CI/CD variable that does not exist
when choosing what packages to install etc., which has been
corrected.

* kn/ci-meson-check-build-docs-fix:
  ci/github: add missing 'CI_JOB_IMAGE' env variable
This commit is contained in:
Junio C Hamano
2025-04-07 14:23:16 -07:00
parent fbca35381b ee89f7c79d
commit e63c3e4296
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
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