Skip to content

Commit d0bbcab

Browse files
committed
ci: Clean up build steps on mac
1 parent a2a9a40 commit d0bbcab

File tree

3 files changed

+14
-75
lines changed

3 files changed

+14
-75
lines changed

.github/workflows/build-macos.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.
Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2024, Collabora, Ltd.
1+
# Copyright 2021-2025, Collabora, Ltd.
22
# SPDX-License-Identifier: CC0-1.0
33

44
name: macOS builds
@@ -8,6 +8,7 @@ on:
88

99
jobs:
1010
macos-build:
11+
name: macOS build
1112
runs-on: macos-latest
1213

1314
steps:
@@ -19,25 +20,22 @@ jobs:
1920
brew update
2021
brew install --formula cmake ninja
2122
# Add any additional dependencies here
22-
23+
2324
- name: Configure Build
2425
run: |
25-
mkdir build
26-
cd build
27-
cmake -G Ninja \
26+
cmake -S . \
27+
-B build \
28+
-G Ninja \
2829
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
2930
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
30-
-DCMAKE_INSTALL_PREFIX=../install \
31-
..
31+
-DCMAKE_INSTALL_PREFIX=install
3232
33-
- name: Build OpenXR Loader
34-
run: |
35-
cd build
36-
cmake --build . --target install
33+
- name: Build OpenXR SDK
34+
run: ninja -C build/ all install
3735

38-
# Note: The com.apple.quarantine attribute is a macOS extended attribute that
39-
# marks files as downloaded from the internet. When this flag is set, macOS’s
40-
# Gatekeeper enforces security checks, prompting users to confirm whether they
36+
# Note: The com.apple.quarantine attribute is a macOS extended attribute that
37+
# marks files as downloaded from the internet. When this flag is set, macOS's
38+
# Gatekeeper enforces security checks, prompting users to confirm whether they
4139
# want to open the file. For developers who download the pre-built OpenXR Loader
4240
# using a web browser, they need to manually remove the quarantine attribute.
4341
- name: Add a note about the Quarantine flag

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2024, Collabora, Ltd.
1+
# Copyright 2021-2025, Collabora, Ltd.
22
# SPDX-License-Identifier: CC0-1.0
33

44
name: Build release artifacts
@@ -20,6 +20,4 @@ jobs:
2020
organizeAndRelease: true
2121

2222
macos-build:
23-
uses: ./.github/workflows/build-macos.yml
24-
with:
25-
organizeAndRelease: true
23+
uses: ./.github/workflows/macos-build.yml

0 commit comments

Comments
 (0)