diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-07 14:23:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-07 14:23:17 -0700 |
| commit | e63c3e429618559e7eab81b49eee787d774f32c2 (patch) | |
| tree | 3c7aa935604328632245aafe81e1d8041327c614 | |
| parent | fbca35381bca1ef3b04fbd418e117fe1c27e66c1 (diff) | |
| parent | ee89f7c79ddb1193c57b67bd7e258ca88a5e87cc (diff) | |
| download | git-e63c3e429618559e7eab81b49eee787d774f32c2.tar.gz | |
Merge branch 'kn/ci-meson-check-build-docs-fix'
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
| -rw-r--r-- | .github/workflows/main.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9959b61ece..37541f3d10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -349,6 +349,7 @@ jobs: if: needs.ci-config.outputs.enabled == 'yes' env: CC: clang + CI_JOB_IMAGE: ubuntu-latest runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -432,6 +433,7 @@ jobs: if: needs.ci-config.outputs.enabled == 'yes' env: jobname: StaticAnalysis + CI_JOB_IMAGE: ubuntu-22.04 runs-on: ubuntu-22.04 concurrency: group: static-analysis-${{ github.ref }} @@ -446,6 +448,7 @@ jobs: if: needs.ci-config.outputs.enabled == 'yes' env: jobname: sparse + CI_JOB_IMAGE: ubuntu-20.04 runs-on: ubuntu-20.04 concurrency: group: sparse-${{ github.ref }} @@ -473,6 +476,7 @@ jobs: cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} env: jobname: Documentation + CI_JOB_IMAGE: ubuntu-latest runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 |