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

Cherry-picks for the 3.x branch (future 3.6) - 14th batch #81112

Merged
merged 20 commits into from
Aug 29, 2023

Conversation

akien-mga
Copy link
Member

Bunch of thirdparty and buildsystem cherry-picks.

akien-mga and others added 9 commits August 29, 2023 11:21
(cherry picked from commit 0baca62)
No change for the files we ship, so just bumping the version number.

(cherry picked from commit 74f21cb)
Changelog: https://github.com/PCRE2Project/pcre2/blob/pcre2-10.42/ChangeLog

This fixes support for RISC-V architectures in the sljit library, so we
enable the module's compilation for `rv64` too.

(cherry picked from commit e289cf7)
tatsuhiro-t/wslay@0e7d106

Just a couple style fixes. Updating only so we know we don't have to review changes
since upstream development seems dormant.

(cherry picked from commit adfc46d)
@AThousandShips
Copy link
Member

AThousandShips commented Aug 29, 2023

Should the server runs also be dependent on static checks? Would be nice to have CI be a single action, even though 2 instead of 8 is an improvement

yedpodtrzitko and others added 9 commits August 29, 2023 12:42
- Use -gdwarf-4 to support both LLVM and GCC when calling addr2line
- Subtract position-independant execuable relocation when passing the
  address to addr2line

(cherry picked from commit 5e041ee)
Musl doesn't compile with it, and by looking online I think that this is
a glibc only thing.

(cherry picked from commit 2a6ce37)
(cherry picked from commit 242ffb7)
mold is now part of the SCons `linker` option.

(cherry picked from commit 074d87d)
Removing the Android toolchain saves 14 GiB, which gives us more room
for growth and to avoid running into out-of-space errors in the Linux
sanitizers + debug symbols builds.

Related to godotengine#79919, though the caches were just one part of the problem,
the real issue is that our Linux sanitizers builds take 12 GiB, and
adding godot-cpp on top with 2 GiB leaves only a few GiB left for the
cache itself.

(cherry picked from commit 611123f)
(cherry picked from commit 90f3992)
@akien-mga
Copy link
Member Author

Should the server runs also be dependent on static checks?

Good catch, this was an oversight. I fixed it.

akien-mga and others added 2 commits August 29, 2023 13:54
This would cause `updown.png` to be ignored in our default theme in 3.x.

These ignores were added in godotengine#36800 for godotengine#36572 (see that PR for usage
instructions).

From a quick test, using `--output-file` for `lcov` and `--output-directory`
for genhtml let us output the files in a way that won't conflict with the
Git repository (e.g. in `bin/`, or outside the Git repo).

(cherry picked from commit 5c38e42)
@akien-mga akien-mga merged commit 98fe7f4 into godotengine:3.x Aug 29, 2023
13 checks passed
@akien-mga akien-mga deleted the 3.x-cherrypicks branch August 29, 2023 13:24
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.

10 participants