Cherry-picks for the 4.0 branch (future 4.0.3) - 5th batch #77202
Conversation
This file contains 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
akien-mga
approved these changes
May 18, 2023
|
Godot-cpp was updated to match #76406 in godotengine/godot-cpp#1095, and seems the CI uses the master branch of godot-cpp unless I've missed something in there |
|
We probably need this change in the diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 44765ee32e..89e6f971a6 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -4,8 +4,8 @@ on:
# Global Settings
env:
- # Only used for the cache key. Increment version to force clean build.
- GODOT_BASE_BRANCH: master
+ # Used for the cache key, and godot-cpp checkout. Add version suffix to force clean build.
+ GODOT_BASE_BRANCH: 4.0
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -182,6 +182,7 @@ jobs:
uses: actions/checkout@v3
with:
repository: godotengine/godot-cpp
+ ref: ${{ env.GODOT_BASE_BRANCH }}
submodules: 'recursive'
path: 'godot-cpp'
And only the second part in the |
|
Yeah, I just arrived to the same conclusion. Will add a commit. |
|
I made a PR as other files needed a fix too: #77204. But feel free to include that commit directly in this PR and supersede mine. |
|
Ah, then I'll just merge and rebase 👍 Thanks! |
This reverts commit 3a5bc74.
Control notifies a theme changed before the editor has entered the tree (cherry picked from commit a103cd7)
(cherry picked from commit bd25709)
(cherry picked from commit bd2e377)
(cherry picked from commit fc92ee6)
(cherry picked from commit 28f391f)
(cherry picked from commit ad21fb0)
(cherry picked from commit 06d0292)
(cherry picked from commit 6a12010)
If no StreamPeerTLS implementation is available, HTTPClient and WebSocketPeer will now correctly refuse to connect using TLS returning ERR_UNAVAILABLE. Similarly, ENetConnection will refuse to setup DTLS when PacketPeerDTLS is not available. (cherry picked from commit eeac6f8)
YuriSizov
force-pushed
the
4.0-cherrypicks
branch
from
8bd3d19 to
0637e85
Compare
YuriSizov
force-pushed
the
4.0-cherrypicks
branch
from
0637e85 to
5fe254e
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Final batch before building 4.0.3-stable.
master.