Skip to content

Commit 392b3d6

Browse files
authored
Merge pull request #283 from akien-mga/ci-windows-fail-on-error
CI: Ensure Windows job fails on error
2 parents 4fdf03d + 51dcc3c commit 392b3d6

1 file changed

Lines changed: 10 additions & 13 deletions

File tree

.github/workflows/build.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
cache-name: linux-x86_64
2121
continue-on-error: true
22-
- name: build-linux-editor-x64
22+
- name: Build for Linux editor x86_64
2323
run: |
24-
pip3 install --user scons
25-
scons platform=linux target=editor generate_bindings=yes -j $(nproc)
24+
pip3 install scons
25+
scons platform=linux target=editor generate_bindings=yes
2626
ldd demo/addons/godot-git-plugin/linux/*.so
2727
- uses: actions/upload-artifact@v4
2828
with:
@@ -41,16 +41,13 @@ jobs:
4141
uses: ./godot-cpp/.github/actions/godot-cache
4242
with:
4343
cache-name: windows-x86_64
44-
- uses: actions/setup-python@v2
45-
with:
46-
python-version: "3.x"
47-
architecture: "x64"
48-
- uses: ilammy/msvc-dev-cmd@v1
44+
- uses: ilammy/msvc-dev-cmd@v1 # For dumpbin.
4945
- uses: ilammy/setup-nasm@v1
50-
- name: build-windows-editor-x64
46+
- name: Build for Windows editor x86_64
47+
shell: powershell
5148
run: |
52-
pip3 install --user scons
53-
scons platform=windows target=editor generate_bindings=yes -j $env:NUMBER_OF_PROCESSORS
49+
pip3 install scons
50+
scons platform=windows target=editor generate_bindings=yes
5451
dumpbin /dependents .\demo\addons\godot-git-plugin\win64\*.dll
5552
- uses: actions/upload-artifact@v4
5653
with:
@@ -69,10 +66,10 @@ jobs:
6966
uses: ./godot-cpp/.github/actions/godot-cache
7067
with:
7168
cache-name: macos-universal
72-
- name: build-macos-editor-universal
69+
- name: Build for macOS editor universal
7370
run: |
7471
brew install scons openssl
75-
scons platform=macos target=editor generate_bindings=yes macos_arch=universal use_llvm=yes macos_deployment_target=10.13 macos_openssl=$(brew --prefix openssl)/ -j $(sysctl -n hw.logicalcpu)
72+
scons platform=macos target=editor generate_bindings=yes macos_arch=universal use_llvm=yes macos_deployment_target=10.13 macos_openssl=$(brew --prefix openssl)/
7673
otool -L demo/addons/godot-git-plugin/macos/*.dylib
7774
- uses: actions/upload-artifact@v4
7875
with:

0 commit comments

Comments
 (0)