Merge branch 'master' into bugfix/bad-xfr-with-other-tasks2

.github/workflows/build-test.yml

@@ -16,9 +16,10 @@ jobs:
             cc: clang
             cflags: -g2 -O0 -fsanitize=address,undefined,leak -fno-sanitize-recover=all
             packages: autoconf automake libtool make libevent-dev libssl-dev flex bison
-          - os: macos-12
+          - os: macos-15
             cflags: -g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover=all
-            packages: autoconf automake libtool openssl libevent flex bison
+            packages: autoconf automake libtool flex bison
+            # The libevent and openssl packages are already installed.
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,7 +48,11 @@ jobs:
           autoconf && autoheader
           (cd simdzone && autoconf && autoheader)
           libtoolize -c -i || glibtoolize -c -i
-          ./configure --enable-checking --disable-flto --with-ssl=yes --with-libevent=yes
+          if test "${{runner.os}}" = 'macOS'; then
+            ./configure --enable-checking --disable-flto --with-ssl=/opt/homebrew/opt/openssl --with-libevent=/opt/homebrew/opt/libevent
+          else
+            ./configure --enable-checking --disable-flto --with-ssl=yes --with-libevent=yes
+          fi
           make -j 2
       - name: 'Run tests'
         id: test

doc/ChangeLog

@@ -1,3 +1,6 @@
+18 October 2024: Wouter
+	- Fix ci to update macos-12 to the macos-15 runner image.
+
 25 September 2024: Wouter
 	- Fix #383: log timestamps in ISO8601 format with timezone.
 	  This adds the option `log-time-iso: yes` that logs in ISO8601

doc/RELNOTES

@@ -15,6 +15,7 @@ BUG FIXES:
 	  prepended to fix detection.
 	- Merge #376: Point the user towards tcpdump for logging individual
 	  queries.
+	- Fix ci to update macos-12 to the macos-15 runner image.
 
 4.10.1
 ================