|
27 | 27 | cache-name: macos-editor
|
28 | 28 | target: editor
|
29 | 29 | tests: true
|
30 |
| - bin: "./bin/godot.macos.editor.x86_64" |
| 30 | + bin: "./bin/godot.macos.editor.universal" |
31 | 31 |
|
32 | 32 | - name: Template (target=template_release)
|
33 | 33 | cache-name: macos-template
|
@@ -60,28 +60,38 @@ jobs:
|
60 | 60 | run: |
|
61 | 61 | sh misc/scripts/install_vulkan_sdk_macos.sh
|
62 | 62 |
|
63 |
| - - name: Compilation |
| 63 | + - name: Compilation (x86_64) |
64 | 64 | uses: ./.github/actions/godot-build
|
65 | 65 | with:
|
66 |
| - sconsflags: ${{ env.SCONSFLAGS }} |
| 66 | + sconsflags: ${{ env.SCONSFLAGS }} arch=x86_64 |
67 | 67 | platform: macos
|
68 | 68 | target: ${{ matrix.target }}
|
69 | 69 | tests: ${{ matrix.tests }}
|
70 | 70 |
|
71 |
| - # Execute unit tests for the editor |
72 |
| - - name: Unit tests |
73 |
| - if: ${{ matrix.tests }} |
74 |
| - run: | |
75 |
| - ${{ matrix.bin }} --version |
76 |
| - ${{ matrix.bin }} --help |
77 |
| - ${{ matrix.bin }} --test |
| 71 | + - name: Compilation (arm64) |
| 72 | + uses: ./.github/actions/godot-build |
| 73 | + with: |
| 74 | + sconsflags: ${{ env.SCONSFLAGS }} arch=arm64 |
| 75 | + platform: macos |
| 76 | + target: ${{ matrix.target }} |
| 77 | + tests: ${{ matrix.tests }} |
78 | 78 |
|
79 | 79 | - name: Prepare artifact
|
80 | 80 | run: |
|
| 81 | + lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal |
| 82 | + rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 |
81 | 83 | strip bin/godot.*
|
82 | 84 | chmod +x bin/godot.*
|
83 | 85 |
|
84 | 86 | - name: Upload artifact
|
85 | 87 | uses: ./.github/actions/upload-artifact
|
86 | 88 | with:
|
87 | 89 | name: ${{ matrix.cache-name }}
|
| 90 | + |
| 91 | + # Execute unit tests for the editor |
| 92 | + - name: Unit tests |
| 93 | + if: ${{ matrix.tests }} |
| 94 | + run: | |
| 95 | + ${{ matrix.bin }} --version |
| 96 | + ${{ matrix.bin }} --help |
| 97 | + ${{ matrix.bin }} --test --force-colors |
0 commit comments