Skip to content
New issue

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

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

Already on GitHub? # to your account

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

Merged
merged 16 commits into from
Nov 6, 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.

@akien-mga akien-mga added this to the 3.3 milestone Nov 5, 2024
@akien-mga akien-mga requested review from a team as code owners November 5, 2024 21:53
@akien-mga akien-mga force-pushed the 3.3-ci-build-warning-fixes branch from 57c38a3 to 77b677e Compare November 5, 2024 21:59
@akien-mga akien-mga marked this pull request as draft November 5, 2024 22:29
Faless and others added 4 commits November 6, 2024 11:24
Co-authored-by: bruvzg <7645683+bruvzg@users.noreply.github.com>
(cherry picked from commit a297a69)
Fix `-Wunused-but-set-variable`, `-Wunqualified-std-cast-call`, and
`-Wliteral-range` warnings.

(cherry picked from commit d8935b2)
@akien-mga akien-mga force-pushed the 3.3-ci-build-warning-fixes branch from 77b677e to f52fd8d Compare November 6, 2024 10:40
akien-mga and others added 4 commits November 6, 2024 11:51
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)
@akien-mga akien-mga force-pushed the 3.3-ci-build-warning-fixes branch from f52fd8d to a53860d Compare November 6, 2024 10:51
@akien-mga akien-mga force-pushed the 3.3-ci-build-warning-fixes branch 5 times, most recently from e4ef29c to 435246b Compare November 6, 2024 11:37
@akien-mga akien-mga force-pushed the 3.3-ci-build-warning-fixes branch from 435246b to 3772a5f Compare November 6, 2024 12:13
@akien-mga akien-mga marked this pull request as ready for review November 6, 2024 12:26
@akien-mga akien-mga requested review from a team as code owners November 6, 2024 12:26
@akien-mga
Copy link
Member Author

Finally passing checks. This was a bit harder than 3.4, I'm dreading trying to do the same for 3.2 now (our first branch with GitHub Actions - I won't bother with earlier branches).

@akien-mga akien-mga changed the title [3.3] Misc. build and warning fixes to pass CI and compile with recent SCons/GCC [3.3] Misc. build and warning fixes to pass CI and compile with recent SCons and GCC/Clang Nov 6, 2024
@akien-mga akien-mga merged commit 01bf239 into godotengine:3.3 Nov 6, 2024
11 checks passed
@akien-mga akien-mga deleted the 3.3-ci-build-warning-fixes branch November 6, 2024 13:57
Comment on lines +21 to +25
<<<<<<< HEAD
- uses: actions/checkout@v4
=======
- uses: actions/checkout@v4
>>>>>>> 6b202812ff (CI: Update all GitHub actions to their latest version)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof, how did this pass CI?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed up with 69962b7.

# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants