Skip to content

Commit f603146

Browse files
authored
Merge pull request #23 from timsutton/smoke-test-macos
Always blocklist xpc_dictionary_set_mach_send, add macOS build matrix for CI
2 parents 3c2ccf3 + 534c1ad commit f603146

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

.github/workflows/rust.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,32 @@ env:
1111

1212
jobs:
1313
build:
14-
15-
runs-on: macos-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
include:
18+
- runner: macos-12
19+
xcode_version: 14.0.1 # macOS SDK: 12.3
20+
- runner: macos-12
21+
xcode_version: 14.2 # macOS SDK: 13.1
22+
- runner: macos-13
23+
xcode_version: 15.2 # macOS SDK: 14.2
24+
- runner: macos-14
25+
xcode_version: 15.3 # macOS SDK: 14.4
26+
# optionally opt into latest stable Xcode version in future
27+
# - runner: macos-14
28+
# xcode_version: latest-stable
29+
runs-on: ${{ matrix.runner }}
1630

1731
steps:
18-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v4
33+
- name: Setup Xcode version
34+
uses: maxim-lobanov/[email protected]
35+
with:
36+
xcode-version: ${{ matrix.xcode_version }}
1937
- name: Build
20-
run: cargo build --verbose
38+
run: |
39+
echo "macOS SDK version: $(xcrun --sdk macosx --show-sdk-version)"
40+
cargo build --verbose
2141
- name: Run tests
2242
run: cargo test --verbose

xpc-sys/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ fn main() {
2929
.allowlist_function("^xpc_.*")
3030
.allowlist_var("^_xpc_.*")
3131
.allowlist_var("^bootstrap_port")
32+
// This function began appearing as of macOS 14.4 SDK headers
33+
.blocklist_function("xpc_dictionary_set_mach_send")
3234
// The following symbols should probably be in libc or mach2, but are not
3335
.allowlist_function("^mach_port.*")
3436
.allowlist_function("^vm_allocate")

0 commit comments

Comments
 (0)