[3.4] Misc. build and warning fixes to pass CI and compile with recent SCons and GCC/Clang #98864
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
The 3.4 branch is EOL and there is no intention to actually release 3.4.6. But as I'm backporting a few compilation and warning fixes to ensure the branch still builds on CI and with recent compilers, the version needs to be updated so it's not wrongly identifying itself as 3.4.5.stable.
akien-mga
force-pushed
the
3.4-ci-build-warning-fixes
branch
2 times, most recently
from
040cc7e to
6ae84b2
Compare
(cherry picked from commit b362976)
Fixes godotengine#91154. (cherry picked from commit ee61ad4)
akien-mga
force-pushed
the
3.4-ci-build-warning-fixes
branch
from
6ae84b2 to
2e1a9df
Compare
(cherry picked from commit 55845ba)
(cherry picked from commit 6f02183)
Co-authored-by: bruvzg <[email protected]> (cherry picked from commit a297a69)
akien-mga
force-pushed
the
3.4-ci-build-warning-fixes
branch
from
2e1a9df to
aca9ef2
Compare
Fix `-Wunused-but-set-variable`, `-Wunqualified-std-cast-call`, and `-Wliteral-range` warnings. (cherry picked from commit d8935b2)
akien-mga
force-pushed
the
3.4-ci-build-warning-fixes
branch
from
aca9ef2 to
509d379
Compare
akien-mga
changed the title
|
It no longer works awwwwww |
(cherry picked from commit 987723b)
akien-mga
force-pushed
the
3.4-ci-build-warning-fixes
branch
from
509d379 to
7a3a6b8
Compare
(cherry picked from commit e771804)
Fixes the following error:
thirdparty/vhacd/inc/vhacdICHull.h:46:31: error: 'uint32_t' does not name a type
46 | ICHullError Process(const uint32_t nPointsCH, const double minVolume = 0.0);
| ^~~~~~~~
Note the upstream version of the third party library is not affected.
(cherry picked from commit a648d83)
Fixes godotengine#77927. (cherry picked from commit 10676e7)
Fixes godotengine#91206. (cherry picked from commit a8ff47b)
bagder/ca-bundle@4d3fe66 Document matching mozilla-release changeset. (cherry picked from commit eb41ff0)
akien-mga
force-pushed
the
3.4-ci-build-warning-fixes
branch
from
7a3a6b8 to
d5345b7
Compare
|
Alright, finally building again on CI for all our targets with |
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.
The 3.4 branch is EOL, but I like keeping branches buildable with current toolchains and CI as occasionally it makes sense to cherry-pick some commits.
In this case to cherry-pick #98855 and not get failing CI, the following changes were needed.
Most are changes already made in 3.5+ and now cherry-picked to 3.4 too, with the exception of:
6b20281 which updates all GitHub Actions to their latest version.
9e9ea71 which removes a usage of
distutils.version.LooseVersionwhich had been removed in 3.5+ by a much bigger refactoring (061c280).Recent Python completely removed
distutils, and the alternative is to use thepackaginglibrary, which isn't part of the standard library and I didn't want to add a new dependency. So I just replaced it with a hack from https://stackoverflow.com/a/11887825, which isn't bullet proof but should be fine here.I'll cherry-pick those changes for earlier branches too with similar PRs.