summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Niklas Hasse <jhasse@bixense.com>2020-11-23 15:41:04 (GMT)
committerJan Niklas Hasse <jhasse@bixense.com>2020-11-23 16:32:13 (GMT)
commit242b7dd90007e1ac493cdf59a0a5980a72409efa (patch)
tree7df6179116322c6944bc23c5f3bb9eae80fa46d9
parenta30ccaef7314f5aa858ba3167af08be4b518d960 (diff)
downloadNinja-242b7dd90007e1ac493cdf59a0a5980a72409efa.zip
Ninja-242b7dd90007e1ac493cdf59a0a5980a72409efa.tar.gz
Ninja-242b7dd90007e1ac493cdf59a0a5980a72409efa.tar.bz2
GitHub Actions: Build Universal Binary for macOS
-rw-r--r--.github/workflows/macos.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 411cfe1..4ea958f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,7 +8,7 @@ on:
jobs:
build:
- runs-on: macOS-latest
+ runs-on: macos-11.0
steps:
- uses: actions/checkout@v2
@@ -21,8 +21,9 @@ jobs:
env:
MACOSX_DEPLOYMENT_TARGET: 10.12
run: |
- cmake -DCMAKE_BUILD_TYPE=Release -B build
- cmake --build build --parallel --config Release
+ sudo xcode-select -s /Applications/Xcode_12.2.app
+ cmake -Bbuild -GXcode '-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64'
+ cmake --build build --config Release
- name: Test ninja
run: ctest -vv
@@ -32,7 +33,7 @@ jobs:
shell: bash
run: |
mkdir artifact
- 7z a artifact/ninja-mac.zip ./build/ninja
+ 7z a artifact/ninja-mac.zip ./build/Release/ninja
# Upload ninja binary archive as an artifact
- name: Upload artifact