]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r1916396, r1916397 from trunk: [CTR for CI changes]
authorJoe Orton <jorton@apache.org>
Mon, 18 Mar 2024 16:53:10 +0000 (16:53 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 18 Mar 2024 16:53:10 +0000 (16:53 +0000)
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

.github/workflows/linux.yml

index 33c7b8582011a8dc1cdf6748ea6aada2e29dc983..6c6f15a68326e5f07c942ba83661d1da549cb9e2 100644 (file)
@@ -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