Skip to content

Commit 0ceecf1

Browse files
committed
update ci for osx
1 parent 6749ff6 commit 0ceecf1

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

.github/workflows/macos_builds.yml

+15-4
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ jobs:
2424
cache-name: macos-editor
2525
target: editor
2626
tests: true
27-
bin: "./bin/godot.macos.editor.x86_64"
27+
bin: "./bin/godot.macos.editor.universal"
2828

2929
- name: Template (target=template_release)
3030
cache-name: macos-template
3131
target: template_release
3232
tests: false
33-
sconsflags: debug_symbols=no
33+
sconsflags: debug_symbols=no tests=yes
34+
bin: "./bin/godot.macos.template_release.universal"
3435

3536
steps:
3637
- uses: actions/checkout@v4
@@ -48,16 +49,26 @@ jobs:
4849
run: |
4950
sh misc/scripts/install_vulkan_sdk_macos.sh
5051
51-
- name: Compilation
52+
- name: Compilation (x86_64)
5253
uses: ./.github/actions/godot-build
5354
with:
54-
sconsflags: ${{ env.SCONSFLAGS }}
55+
sconsflags: ${{ env.SCONSFLAGS }} arch=x86_64
56+
platform: macos
57+
target: ${{ matrix.target }}
58+
tests: ${{ matrix.tests }}
59+
60+
- name: Compilation (arm64)
61+
uses: ./.github/actions/godot-build
62+
with:
63+
sconsflags: ${{ env.SCONSFLAGS }} arch=arm64
5564
platform: macos
5665
target: ${{ matrix.target }}
5766
tests: ${{ matrix.tests }}
5867

5968
- name: Prepare artifact
6069
run: |
70+
lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal
71+
rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
6172
strip bin/godot.*
6273
chmod +x bin/godot.*
6374

0 commit comments

Comments
 (0)