Skip to content

macOs CI update. #12998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 22, 2023
Merged

macOs CI update. #12998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38963d8
macOs CI update.
devnexen Dec 22, 2023
171d539
fix pcre2 macos codepath prototype
devnexen Dec 22, 2023
658ab7f
fix fpm kqueue prototype
devnexen Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ext/pcre/pcre2lib/sljit/sljitExecAllocator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/events/kqueue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down