From 38963d889aecce3d36fac7de61ccacbd1a7d056f Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 22 Dec 2023 11:26:30 +0000 Subject: [PATCH 1/3] macOs CI update. since sonoma (14) had been released since few months, we could afford to upgrade to its previous release. --- .github/workflows/nightly.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5f74afa2c666..1a31fd31b4e2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -234,7 +234,7 @@ jobs: debug: [true, false] zts: [true, false] name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" - runs-on: macos-12 + runs-on: macos-13 steps: - name: git checkout uses: actions/checkout@v4 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 61c425fe93b4..fbcc6a69cddd 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -150,7 +150,7 @@ jobs: if: ${{ !matrix.asan }} uses: ./.github/actions/verify-generated-files MACOS_DEBUG_NTS: - runs-on: macos-12 + runs-on: macos-13 steps: - name: git checkout uses: actions/checkout@v4 From 171d5399010556360643fd52ed8e8108145a05f1 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 22 Dec 2023 11:38:45 +0000 Subject: [PATCH 2/3] fix pcre2 macos codepath prototype --- ext/pcre/pcre2lib/sljit/sljitExecAllocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c b/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c index 92d940ddc248..6d43040b8e72 100644 --- a/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c +++ b/ext/pcre/pcre2lib/sljit/sljitExecAllocator.c @@ -110,7 +110,7 @@ static SLJIT_INLINE void free_chunk(void *chunk, sljit_uw size) #define SLJIT_MAP_JIT (get_map_jit_flag()) -static SLJIT_INLINE int get_map_jit_flag() +static SLJIT_INLINE int get_map_jit_flag(void) { size_t page_size; void *ptr; From 658ab7f9bc0509a4f9f1c3ffcd0f2e33e8272c26 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 22 Dec 2023 11:58:15 +0000 Subject: [PATCH 3/3] fix fpm kqueue prototype --- sapi/fpm/fpm/events/kqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/fpm/fpm/events/kqueue.c b/sapi/fpm/fpm/events/kqueue.c index 8fc4a6f049b0..b81650d7741d 100644 --- a/sapi/fpm/fpm/events/kqueue.c +++ b/sapi/fpm/fpm/events/kqueue.c @@ -96,7 +96,7 @@ static int fpm_event_kqueue_init(int max) /* {{{ */ /* * release kqueue stuff */ -static int fpm_event_kqueue_clean() /* {{{ */ +static int fpm_event_kqueue_clean(void) /* {{{ */ { if (kevents) { free(kevents);