Skip to content

Commit 37cefe2

Browse files
committed
Fix macOS test app build and update Xcode setup in workflow
Consolidate Xcode installation for macOS 15 and 26 to use the latest stable version. Additionally, fix a compilation error on macOS by adding a header guard and forward declaration for audit_token_t before including libproc.h.
1 parent dd5611c commit 37cefe2

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

.github/workflows/test_macos.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
- uses: actions/checkout@v6
8787

8888
- name: Install XCode
89-
if: ${{ contains(matrix.os, 'macos-15') }}
89+
if: ${{ contains(matrix.os, 'macos-15') || contains(matrix.os, 'macos-26') }}
9090
uses: maxim-lobanov/setup-xcode@v1
9191
with:
9292
xcode-version: latest-stable
@@ -97,12 +97,6 @@ jobs:
9797
with:
9898
xcode-version: '15.3'
9999

100-
- name: Install XCode
101-
if: ${{ contains(matrix.os, 'macos-26') }}
102-
uses: maxim-lobanov/setup-xcode@v1
103-
with:
104-
xcode-version: '26.1'
105-
106100
- name: Reinstall GCC 12 on macOS 14
107101
if: ${{ contains(matrix.os, 'macos-14') && contains(matrix.c_compiler, 'gcc-12') }}
108102
shell: bash

tests/src/utils/filesystem.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
#include <windows.h>
1919
#elif defined( __APPLE__ )
2020
#include <array>
21+
// Workaround for building with latest macOS SDK
22+
#define _MACH_MESSAGE_H_ // NOLINT(*-reserved-identifier)
23+
struct audit_token_t;
2124
#include <libproc.h> // for proc_pidpath and PROC_PIDPATHINFO_MAXSIZE
2225
#include <unistd.h> // for getpid
2326
#elif defined( __FreeBSD__ ) || defined( __DragonFly__ )

0 commit comments

Comments
 (0)