-
-
Notifications
You must be signed in to change notification settings - Fork 79
CI: Ensure Windows job fails on error #283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
akien-mga
merged 1 commit into
godotengine:master
from
akien-mga:ci-windows-fail-on-error
May 27, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,10 +19,10 @@ jobs: | |
with: | ||
cache-name: linux-x86_64 | ||
continue-on-error: true | ||
- name: build-linux-editor-x64 | ||
- name: Build for Linux editor x86_64 | ||
run: | | ||
pip3 install --user scons | ||
scons platform=linux target=editor generate_bindings=yes -j $(nproc) | ||
pip3 install scons | ||
scons platform=linux target=editor generate_bindings=yes | ||
ldd demo/addons/godot-git-plugin/linux/*.so | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
|
@@ -41,16 +41,13 @@ jobs: | |
uses: ./godot-cpp/.github/actions/godot-cache | ||
with: | ||
cache-name: windows-x86_64 | ||
- uses: actions/setup-python@v2 | ||
with: | ||
python-version: "3.x" | ||
architecture: "x64" | ||
- uses: ilammy/msvc-dev-cmd@v1 | ||
- uses: ilammy/msvc-dev-cmd@v1 # For dumpbin. | ||
- uses: ilammy/setup-nasm@v1 | ||
- name: build-windows-editor-x64 | ||
- name: Build for Windows editor x86_64 | ||
shell: powershell | ||
Calinou marked this conversation as resolved.
Show resolved
Hide resolved
|
||
run: | | ||
pip3 install --user scons | ||
scons platform=windows target=editor generate_bindings=yes -j $env:NUMBER_OF_PROCESSORS | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed the explicit ncpu stuff as this is the default behavior of godot-cpp now. |
||
pip3 install scons | ||
scons platform=windows target=editor generate_bindings=yes | ||
dumpbin /dependents .\demo\addons\godot-git-plugin\win64\*.dll | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
|
@@ -69,10 +66,10 @@ jobs: | |
uses: ./godot-cpp/.github/actions/godot-cache | ||
with: | ||
cache-name: macos-universal | ||
- name: build-macos-editor-universal | ||
- name: Build for macOS editor universal | ||
run: | | ||
brew install scons openssl | ||
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) | ||
scons platform=macos target=editor generate_bindings=yes macos_arch=universal use_llvm=yes macos_deployment_target=10.13 macos_openssl=$(brew --prefix openssl)/ | ||
otool -L demo/addons/godot-git-plugin/macos/*.dylib | ||
- uses: actions/upload-artifact@v4 | ||
with: | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed this as Python is already default installed. One consequence was that the user pip install path was not in
PATH
anymore, so I changed the installs to be global (which is what we do for Godot too).