Skip to content

Commit f9b05c8

Browse files
authored
Revert "Bump actions/download-artifact from 3 to 4 in /.github/workflows (#196)" (#197)
This reverts commit 34be8d7.
1 parent 34be8d7 commit f9b05c8

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.github/workflows/macos_builds.yml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,38 +60,28 @@ jobs:
6060
run: |
6161
sh misc/scripts/install_vulkan_sdk_macos.sh
6262
63-
- name: Compilation (x86_64)
63+
- name: Compilation
6464
uses: ./.github/actions/godot-build
6565
with:
66-
sconsflags: ${{ env.SCONSFLAGS }} arch=x86_64
66+
sconsflags: ${{ env.SCONSFLAGS }}
6767
platform: macos
6868
target: ${{ matrix.target }}
6969
tests: ${{ matrix.tests }}
7070

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 }}
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
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
8381
strip bin/godot.*
8482
chmod +x bin/godot.*
8583
8684
- name: Upload artifact
8785
uses: ./.github/actions/upload-artifact
8886
with:
8987
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@v4
62+
uses: actions/download-artifact@v3
6363
with:
6464
name: ${{ matrix.name }}
6565
path: ${{ matrix.name }}

0 commit comments

Comments
 (0)