Cherry-picks for the godot-cpp 4.1 branch - 7th batch#1373
Merged
Conversation
This was referenced Jan 22, 2024
Merged
(cherry picked from commit bcac96c)
It has just been removed from the Ubuntu 20.04 default install, breaking our CI setup. Also, sets Emscripten version to 3.1.39, as done upstream. Newer versions actually break dynamic library support. (cherry picked from commit eea33b4)
…tensions. (cherry picked from commit adc9def)
Bumps [mymindstorm/setup-emsdk](https://github.com/mymindstorm/setup-emsdk) from 12 to 13. - [Release notes](https://github.com/mymindstorm/setup-emsdk/releases) - [Commits](emscripten-core/setup-emsdk@v12...v13) --- updated-dependencies: - dependency-name: mymindstorm/setup-emsdk dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 78bf5a4)
(cherry picked from commit 79d2a9c)
(cherry picked from commit db884e9)
(cherry picked from commit 39c139c)
(cherry picked from commit 20c4e84)
(cherry picked from commit cad5be5)
…builds The CMake buildsystem should be completely reviewed to properly match what is done by SCons, instead of making its own arbitrary decisions on how godot-cpp should be compiled. Currently the SCons setup doesn't include warning options, so CMake shouldn't either. Options similar to upstream Godot's SCons setup could be added, and then replicated for CMake. (cherry picked from commit 41517ea)
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit a7becb4)
(cherry picked from commit e17c7bf)
(cherry picked from commit 718d0ba)
(cherry picked from commit f037a69)
(cherry picked from commit bd40a94)
(cherry picked from commit ee169b2)
dsnopek
force-pushed
the
4.1-cherrypicks-7
branch
from
January 22, 2024 21:54
050ce8a to
ad5d8dc
Compare
This was referenced Jan 22, 2024
Contributor
|
Just FYI we plan one more 4.1.x release of the engine itself, RC later this week, and that's probably it. |
(cherry picked from commit 8a535d0)
dsnopek
force-pushed
the
4.1-cherrypicks-7
branch
from
January 24, 2024 14:44
ad5d8dc to
2cc9677
Compare
Collaborator
Author
|
I've removed the cherry-pick of PR #1357 for now |
akien-mga
approved these changes
Feb 16, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
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.
The 7th batch of PR's marked with
cherrypick:4.1