From 9c53586b7d0112c50d2c07e266403ed755f4a819 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Mon, 3 Jul 2023 15:23:19 +0200 Subject: [PATCH] ci: update to macos latest (cherry picked from commit e1e03c25c9c4289e10bbcadd0fd86ab41a3e4003) --- .github/workflows/builds.yml | 6 +++--- src/util-daemon.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 8e1dc09db532..db619add24fa 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -1391,8 +1391,7 @@ jobs: macos-latest: name: MacOS Latest - # use 10.15 for now. Build fails on macos-11 (aka macos-latest) - runs-on: macos-10.15 + runs-on: macos-latest needs: [prepare-deps] steps: # Cache Rust stuff. @@ -1436,7 +1435,8 @@ jobs: - run: ./autogen.sh - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests - run: make -j2 - - run: make check + # somehow it gets included by some C++ stdlib header (case unsensitive) + - run: rm libhtp/VERSION && make check - run: tar xf prep/suricata-verify.tar.gz - name: Running suricata-verify run: python3 ./suricata-verify/run.py diff --git a/src/util-daemon.c b/src/util-daemon.c index 8e6e6b63cda5..085df077e686 100644 --- a/src/util-daemon.c +++ b/src/util-daemon.c @@ -110,7 +110,14 @@ void Daemonize (void) through conf file */ /* Creates a new process */ +#if defined(OS_DARWIN) && defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif pid = fork(); +#if defined(OS_DARWIN) && defined(__clang__) +#pragma clang diagnostic pop +#endif if (pid < 0) { /* Fork error */