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

Godot 4.2 support #181

Merged
merged 13 commits into from
Dec 13, 2023
Merged

Godot 4.2 support #181

merged 13 commits into from
Dec 13, 2023

Conversation

bitbrain
Copy link
Contributor

@bitbrain bitbrain commented Dec 2, 2023

This pull request makes this extension compatible with Godot 4.2 - please read comments for more details.

  • also updated to latest GUT

@bitbrain bitbrain changed the title update godot-cpp to 4.2-stable Godot 4.2 support Dec 3, 2023
@@ -156,6 +156,13 @@ jobs:
lfs: true
submodules: recursive

- name: Android dependencies
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is required due to this error:

 sh: 1: /usr/local/lib/android/sdk/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++: not found

@@ -57,7 +57,7 @@ jobs:
fmod-studio-platform-folder: linux/studio/lib/x86_64
fmod-library-suffix: so
godot-executable-download-suffix: linux.x86_64.zip
godot-executable: Godot_v4.1.2-stable_linux.x86_64
godot-executable: Godot_v$GODOT_VERSION-stable_linux.x86_64
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Standardising this, so one only has to ever bump the env var

godot-cpp Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated from godot-4.1.2-stable to godot-4.2-stable

@@ -7,6 +7,7 @@ namespace godot {
class FmodPerformanceData : public RefCounted {
GDCLASS(FmodPerformanceData, RefCounted);

public:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

default access on GDCLASS changed in godot-cpp in godotengine/godot-cpp#1292 from public to private

Hence, we have to make the public access now explicit.

@bitbrain bitbrain requested review from piiertho and CedNaru December 3, 2023 13:15
fi
if echo "$line" | grep -q "Failing tests 0"; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This does not work any longer in latest GUT. A better way is to extract the number of passing tests vs total tests and ensure they are the same.

Copy link
Member

@piiertho piiertho left a comment

Choose a reason for hiding this comment

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

Thanks a lot for this work !
Please set a meaningful commit message when squashing.

@bitbrain bitbrain merged commit f7645f4 into master Dec 13, 2023
15 checks passed
@piiertho piiertho deleted the godot-4.2 branch May 19, 2024 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants