From be19b272f1154e93725d8d138c1fc1aeccae2e64 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 15 Oct 2024 11:33:02 +0000 Subject: [PATCH] Merge r1921311 from trunk: [RTC exception for CI] 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/branches/2.4.x@1921330 13f79535-47bb-0310-9956-ffa450edef68 --- .github/workflows/linux.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 69c3fd380cf..592002ca99f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -247,10 +247,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