Cherry-picks for the godot-cpp 4.1 branch - 1st batch #1205
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
dsnopek
added
bug
|
So to fully copy the process for the main repo you need to use the |
(cherry picked from commit 4df112c)
…time (cherry picked from commit efc16b4)
# Conflicts: # binding_generator.py (cherry picked from commit 548c758)
(cherry picked from commit 9d9f427)
(cherry picked from commit 2586ad0)
(cherry picked from commit 6d19513)
Co-authored-by: David Snopek <dsnopek@gmail.com> (cherry picked from commit a745c2a)
dsnopek
force-pushed
the
4.1-cherrypicks-1
branch
from
e6ab89f to
4fb9af7
Compare
Thanks! I've redone the PR with |
vnen
approved these changes
Aug 11, 2023
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.
This is my first attempt at a cherry-picking PR :-)
I attempted to mimick what @akien-mga and @YuriSizov do, but may have missed something. Feedback welcome!
Since we haven't managed to fully discuss this process at a GDExtension meeting, I'd like to make sure to cover it at tomorrow's meeting before merging this.
I also realized while making this that our CI always runs with the latest Godot artifact, which is good for the
masterbranch, but for these cherry-picks, we'd really want it to run with the latest Godot 4.1 release. I'll spend some time thinking about how we can do that. However, I locally ran the automated tests with this PR and Godot 4.1.1.