Skip to content

Commit 2f4837f

Browse files
committed
fix: macos
1 parent 9cba591 commit 2f4837f

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Build
55

66
on:
77
push:
8-
branches: [main]
8+
branches: [main, CI_test]
99
workflow_dispatch:
1010
workflow_call:
1111
inputs:
@@ -48,12 +48,10 @@ jobs:
4848
configure_preset: dev-windows
4949
build_preset: workflow-release
5050
deps_generator: "Visual Studio 17 2022"
51-
deps_generator_extra: -A x64 -T v143
5251
- os: macos-latest
5352
configure_preset: dev-macos
5453
build_preset: workflow-release-macos
5554
deps_generator: Xcode
56-
deps_generator_extra: -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
5755

5856
runs-on: ${{ matrix.os }}
5957

@@ -75,9 +73,15 @@ jobs:
7573
- name: Build dependencies (on cache miss)
7674
if: steps.deps-cache.outputs.cache-hit != 'true'
7775
run: |
76+
deps_extra=()
77+
if [[ "$RUNNER_OS" == "Windows" ]]; then
78+
deps_extra=(-A x64 -T v143)
79+
elif [[ "$RUNNER_OS" == "macOS" ]]; then
80+
deps_extra=("-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64")
81+
fi
7882
cmake -S dependency -B _build_msvc/cmt_deps \
7983
-G "${{ matrix.deps_generator }}" \
80-
${{ matrix.deps_generator_extra }} \
84+
"${deps_extra[@]}" \
8185
"-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE=${{ github.workspace }}/_build_msvc/cmt_deps_prebuilt/lib" \
8286
"-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG=${{ github.workspace }}/_build_msvc/cmt_deps_prebuilt/lib"
8387
cmake --build _build_msvc/cmt_deps --config Release

0 commit comments

Comments
 (0)