From: Joe Orton <jorton@apache.org>
Date: Mon, 18 Mar 2024 16:53:10 +0000 (+0000)
Subject: Merge r1916396, r1916397 from trunk: [CTR for CI changes]
X-Git-Tag: 2.4.59-rc1-candidate~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dfab2de27bca614eb93cc55a3456858d522cc53;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1916396, r1916397 from trunk: [CTR for CI changes]

CI: Try working around recent ASAN failures.
CI: conditional didn't work in r1916396, always apply ASAN workaround.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916398 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 33c7b858201..6c6f15a6832 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -246,6 +246,9 @@ jobs:
       run: |
         echo "${{ matrix.env }}" >> $GITHUB_ENV
         echo JOBID=`echo "${{ 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
     - name: apt refresh
       run: sudo apt-get -o Acquire::Retries=5 update
     - name: Install prerequisites