Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2] Misc. build and warning fixes to pass CI and compile with recent SCons and GCC/Clang #98900

Merged
merged 21 commits into from
Nov 7, 2024

Conversation

akien-mga
Copy link
Member

Likewise, this doesn't mean restarting active support for the 3.3 branch, this is just a code/history preservation improvement.

No longer parse emscripten/emsdk config to detect emcc/node paths.
Use WhereIs to find "emcc" and "node", look for "node_modules" in "emcc"
path.

(cherry picked from commit 7998745)
(cherry picked from commit 2d5f9c5)
@akien-mga akien-mga force-pushed the 3.2-ci-build-warnings-fixes branch 2 times, most recently from a5a5f01 to 27361ff Compare November 6, 2024 23:30
@akien-mga akien-mga requested review from a team as code owners November 6, 2024 23:30
@akien-mga akien-mga force-pushed the 3.2-ci-build-warnings-fixes branch 3 times, most recently from 5d4c988 to cc0e1d2 Compare November 6, 2024 23:41
@akien-mga akien-mga marked this pull request as draft November 7, 2024 00:25
@akien-mga akien-mga force-pushed the 3.2-ci-build-warnings-fixes branch 7 times, most recently from 98d39a2 to 676a6e2 Compare November 7, 2024 11:01
akien-mga and others added 19 commits November 7, 2024 12:19
(cherry picked from commit c191cfb)
Co-authored-by: bruvzg <[email protected]>
(cherry picked from commit a297a69)
Fix `-Wunused-but-set-variable`, `-Wunqualified-std-cast-call`, and
`-Wliteral-range` warnings.

(cherry picked from commit d8935b2)
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)
It's raised for us on many comparators implemented to be able to store a struct
in `Set` or `Map` (who rely on `operator<` internally). In the cases I reviewed
we don't actually care about the ordering and we use the struct's function
pointers as that's the only distinctive data available.

(cherry picked from commit 802810c)
(cherry picked from commit 4c79dcc)
bagder/ca-bundle@4d3fe66

Document matching mozilla-release changeset.

(cherry picked from commit eb41ff0)
@akien-mga akien-mga marked this pull request as ready for review November 7, 2024 11:45
@akien-mga
Copy link
Member Author

Alright, finally got CI passing on 3.2 too. I had to redo some of the Android SDK/NDK config as the GitHub Action provided SDK/NDK were somehow conflicting with Java 8.

@akien-mga akien-mga merged commit a030197 into godotengine:3.2 Nov 7, 2024
12 checks passed
@akien-mga akien-mga deleted the 3.2-ci-build-warnings-fixes branch November 7, 2024 11:46
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.

4 participants