Skip to content

Commit 5de4af5

Browse files
piierthoCedNaru
andauthored
Feature/make compile with godot 4.3 rc3 (#659)
* feat: make cpp code compile with godot 4.3-RC3 * feat: regenerate api for 4.3-RC3 * chore: bump godot version in CI * Fix MoltenVK build * feat: update to godot 4.3-stable * fix: use AttachCurrentThreadAsDaemon while godot did not fix WorkerThreadPool * fix(ci): set new MoltenVK location * fix(ci): use maximize-build-space to reduce occupied disk space for linux --------- Co-authored-by: Ced Naru <cednaru.dev@gmail.com>
1 parent d9b7cb3 commit 5de4af5

File tree

360 files changed

+69826
-27923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+69826
-27923
lines changed

.github/workflows/assemble_ios.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
jobs:
1515
create-ios-export-template-universal:
16-
runs-on: macos-latest
16+
runs-on: macos-13 #MoltenVK is built differently if using macos-14+
1717
name: Assemble iOS export template
1818
steps:
1919
- name: Clone Godot Engine
@@ -22,8 +22,12 @@ jobs:
2222
repository: godotengine/godot
2323
ref: ${{ inputs.godot-version }}
2424

25+
# Python must be kept below 3.12
26+
#https://github.com/KhronosGroup/MoltenVK/blob/3b9e335fe8fc8a72cf6099acbd54128889445c0a/.github/workflows/CI.yml#L44
2527
- name: Setup python and scons
2628
uses: ./.github/actions/godot-deps
29+
with:
30+
python-version: 3.11
2731

2832
- name: Download ios export template binaries
2933
uses: actions/download-artifact@v4
@@ -36,7 +40,7 @@ jobs:
3640
with:
3741
repository: KhronosGroup/MoltenVK
3842
path: MoltenVk
39-
ref: v1.2.6
43+
ref: v1.2.10
4044

4145
- name: Build MoltenVK
4246
run: |
@@ -45,7 +49,7 @@ jobs:
4549
- name: Create iOS template app
4650
run: |
4751
cp -r misc/dist/ios_xcode .
48-
cp -r MoltenVK/Package/Release/MoltenVK/MoltenVK.xcframework ios_xcode/
52+
cp -r MoltenVK/Package/Release/MoltenVK/dynamic/MoltenVK.xcframework ios_xcode/
4953
cp libgodot.ios.template_release.arm64.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
5054
cp libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
5155
mv ios_xcode/ ios/ && cd ios/

.github/workflows/build_linux.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ jobs:
4343
sconsflags: ''
4444

4545
steps:
46+
- name: Maximize build disk space
47+
uses: easimon/maximize-build-space@v10
48+
4649
- name: Clone Godot Engine
4750
uses: actions/checkout@v4
4851
with:

.github/workflows/trigger_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- run: |
6767
echo "Setup done"
6868
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
69-
godot-version: "4.2.2-stable"
69+
godot-version: "4.3-stable"
7070
jvm-version: "17"
7171

7272
build-jvm:

.github/workflows/trigger_on_pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- run: |
1515
echo "Setup done"
1616
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
17-
godot-kotlin-jvm-version: "0.9.1-4.2.2"
18-
godot-version: "4.2.2-stable"
17+
godot-kotlin-jvm-version: "0.9.1-4.3.0"
18+
godot-version: "4.3-stable"
1919
jvm-version: "17"
2020

2121
build-jvm:

.github/workflows/trigger_on_push_master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- run: |
2020
echo "Setup done"
2121
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
22-
godot-kotlin-jvm-version: "0.9.1-4.2.2"
23-
godot-version: "4.2.2-stable"
22+
godot-kotlin-jvm-version: "0.9.1-4.3.0"
23+
godot-version: "4.3-stable"
2424
jvm-version: "17"
2525

2626
build-jvm:

.github/workflows/trigger_on_tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
- run: |
2525
echo "Setup done"
2626
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
27-
godot-kotlin-jvm-version: "0.9.1-4.2.2"
28-
godot-version: "4.2.2-stable"
27+
godot-kotlin-jvm-version: "0.9.1-4.3.0"
28+
godot-version: "4.3-stable"
2929
jvm-version: "17"
3030

3131
build-jvm:

docs/src/doc/contribution/setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Make sure that Java is installed and its `PATH` set in your system as well (**at
1515
Once you have all the necessary dependencies, proceed to do the following:
1616

1717
1. Clone Godot's repository with the stable tag you want to develop for. Notice that the branch tag must be
18-
aligned to the current binding's version (e.g., current version `0.9.1-4.2.2`, we need Godot at `4.2.2` version).
18+
aligned to the current binding's version (e.g., current version `0.9.1-4.3.0`, we need Godot at `4.3.0` version).
1919

2020
```bash
21-
git clone git@github.com:godotengine/godot.git --branch 4.2.2-stable --recursive
21+
git clone git@github.com:godotengine/godot.git --branch 4.3-stable --recursive
2222
```
2323

2424
2. In the `godot` directory, run the following command:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The module uses semantic versioning for its own versions but adds a suffix for the supported Godot version:
22

3-
Full version: `0.9.1-4.2.2`
3+
Full version: `0.9.1-4.3.0`
44

55
Module Version: `0.9.1`
66

7-
Supported Godot Version: `4.2.2`
7+
Supported Godot Version: `4.3.0`

kt/api-generator/src/main/resources/api.json

Lines changed: 46646 additions & 24770 deletions
Large diffs are not rendered by default.

kt/godot-library/src/main/kotlin/godot/gen/godot/AStar2D.kt

Lines changed: 19 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)