Skip to content

Commit 4d10a74

Browse files
Dependabot/GitHub actions/dot GitHub/workflows/actions/download artifact 4 (#198)
* Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * chore: update actions/download-artifact * chore: update macos build * fix: issue with macos_builds.yml --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent f9b05c8 commit 4d10a74

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.github/workflows/macos_builds.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
cache-name: macos-editor
2828
target: editor
2929
tests: true
30-
bin: "./bin/godot.macos.editor.x86_64"
30+
bin: "./bin/godot.macos.editor.universal"
3131

3232
- name: Template (target=template_release)
3333
cache-name: macos-template
@@ -60,28 +60,38 @@ jobs:
6060
run: |
6161
sh misc/scripts/install_vulkan_sdk_macos.sh
6262
63-
- name: Compilation
63+
- name: Compilation (x86_64)
6464
uses: ./.github/actions/godot-build
6565
with:
66-
sconsflags: ${{ env.SCONSFLAGS }}
66+
sconsflags: ${{ env.SCONSFLAGS }} arch=x86_64
6767
platform: macos
6868
target: ${{ matrix.target }}
6969
tests: ${{ matrix.tests }}
7070

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 }}
7878

7979
- name: Prepare artifact
8080
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
8183
strip bin/godot.*
8284
chmod +x bin/godot.*
8385
8486
- name: Upload artifact
8587
uses: ./.github/actions/upload-artifact
8688
with:
8789
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

.github/workflows/release_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
uses: actions/checkout@v4
6060

6161
- name: ⏬ Download build
62-
uses: actions/download-artifact@v3
62+
uses: actions/download-artifact@v4
6363
with:
6464
name: ${{ matrix.name }}
6565
path: ${{ matrix.name }}

0 commit comments

Comments
 (0)