Skip to content

Cherry-picks for the 4.0 branch (future 4.0.3) - 5th batch#77202

Merged
akien-mga merged 13 commits intogodotengine:4.0from
YuriSizov:4.0-cherrypicks
May 19, 2023
Merged

Cherry-picks for the 4.0 branch (future 4.0.3) - 5th batch#77202
akien-mga merged 13 commits intogodotengine:4.0from
YuriSizov:4.0-cherrypicks

Conversation

@YuriSizov
Copy link
Contributor

@YuriSizov YuriSizov commented May 18, 2023

Final batch before building 4.0.3-stable.

  • Two previous cherry-pick have been reverted.
  • Several documentation changes and very safe fixes (including crashes) added.
  • Changelog should be up to date.
  • Still needs a version bump ahead of starting the build 🙃

@YuriSizov YuriSizov added this to the 4.0 milestone May 18, 2023
@YuriSizov YuriSizov requested a review from akien-mga May 18, 2023 12:37
@YuriSizov YuriSizov requested review from a team as code owners May 18, 2023 12:37
@YuriSizov YuriSizov requested a review from a team May 18, 2023 12:37
@YuriSizov YuriSizov requested review from a team as code owners May 18, 2023 12:37
@AThousandShips
Copy link
Member

AThousandShips commented 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

@akien-mga
Copy link
Member

akien-mga commented May 18, 2023

We probably need this change in the 4.0 branch:

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 master branch, for consistency.

@YuriSizov
Copy link
Contributor Author

Yeah, I just arrived to the same conclusion. Will add a commit.

@akien-mga
Copy link
Member

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.

@YuriSizov
Copy link
Contributor Author

Ah, then I'll just merge and rebase 👍 Thanks!

YuriSizov and others added 10 commits May 18, 2023 19:22
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 06d0292)
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 YuriSizov requested a review from a team as a code owner May 18, 2023 18:00
AThousandShips and others added 3 commits May 18, 2023 21:46
Prevents errors when assigning the same texture to both slots

(cherry picked from commit 0648cc6)
@akien-mga akien-mga merged commit 1388827 into godotengine:4.0 May 19, 2023
@akien-mga
Copy link
Member

Thanks!

@YuriSizov YuriSizov deleted the 4.0-cherrypicks branch June 16, 2023 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.