Mailing List Archive

Author: jorton
Date: Mon Mar 18 16:53:10 2024
New Revision: 1916398

URL: http://svn.apache.org/viewvc?rev=1916398&view=rev
Log:
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.

Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/.github/workflows/linux.yml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1916396-1916397

Modified: httpd/httpd/branches/2.4.x/.github/workflows/linux.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.github/workflows/linux.yml?rev=1916398&r1=1916397&r2=1916398&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.github/workflows/linux.yml (original)
+++ httpd/httpd/branches/2.4.x/.github/workflows/linux.yml Mon Mar 18 16:53:10 2024
@@ -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