diff options
| author | Joe Orton <jorton@apache.org> | 2024-10-14 18:09:50 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2024-10-14 18:09:50 +0200 |
| commit | 584ed86f30b46bff41451f874cf52bf0a0db4208 (patch) | |
| tree | 22c8327d792f21e056f659e56922b36a6e5ce1a4 /.github | |
| parent | CI: Further fixes for ubuntu-latest image updates on GitHub Actions. (diff) | |
| download | apache2-584ed86f30b46bff41451f874cf52bf0a0db4208.tar.xz apache2-584ed86f30b46bff41451f874cf52bf0a0db4208.zip | |
CI: Use the image version in the cache keys. This is likely a simpler
and more robust fix for the issues with Perl XS builds being cached.
Root cause was likely "ubuntu-latest" changing from 22.04 to 24.04.
Cache keys will now change when that happens again, preventing reuse
of cached builds across OS versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1921311 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d12361c05b..22729a8799 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -319,10 +319,14 @@ jobs: CONFIG: ${{ matrix.config }} name: ${{ matrix.name }} steps: + # JOBID is used in the cache keys, created here as a hash of all + # properties of the environment, including the image OS version, + # compiler flags and any job-specific properties. - name: Set environment variables run: | echo "${{ matrix.env }}" >> $GITHUB_ENV - echo JOBID=`echo "${{ matrix.notest-cflags }} ${{ matrix.env }} ${{ matrix.config }}'"| md5sum - | sed 's/ .*//'` >> $GITHUB_ENV + echo JOBID=`echo "OS=$ImageOS ${{ matrix.notest-cflags }} ${{ matrix.env }} ${{ matrix.config }}" \ + | md5sum - | sed 's/ .*//'` >> $GITHUB_ENV # https://github.com/actions/runner-images/issues/9491#issuecomment-1989718917 - name: Workaround ASAN issue in Ubuntu 22.04 run: sudo sysctl vm.mmap_rnd_bits=28 |