git subrepo pull (merge) --force --branch=groups-4.4.2025-01-25T05444…

…8Z godot

subrepo:
  subdir:   "godot"
  merged:   "157b5aaf62"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-4.4.2025-01-25T054448Z"
  commit:   "157b5aaf62"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"

godot/.github/actions/godot-cpp-build/action.yml

@@ -0,0 +1,39 @@
+name: Build godot-cpp
+description: Build godot-cpp with the provided options.
+
+env:
+  GODOT_CPP_BRANCH: 4.3
+
+inputs:
+  bin:
+    description: Path to the Godot binary.
+    required: true
+    type: string
+  scons-flags:
+    description: Additional SCons flags.
+    type: string
+  scons-cache:
+    description: The SCons cache path.
+    default: ${{ github.workspace }}/.scons_cache/
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        repository: godotengine/godot-cpp
+        ref: ${{ env.GODOT_CPP_BRANCH }}
+        path: godot-cpp
+
+    - name: Extract API
+      shell: sh
+      run: ${{ inputs.bin }} --headless --dump-gdextension-interface --dump-extension-api
+
+    - name: SCons Build
+      shell: sh
+      env:
+        SCONS_CACHE: ${{ inputs.scons-cache }}
+      run: scons --directory=./godot-cpp/test "gdextension_dir=${{ github.workspace }}" ${{ inputs.scons-flags }}

godot/.github/workflows/android_builds.yml

@@ -12,6 +12,7 @@ jobs:
   build-android:
     runs-on: ubuntu-24.04
     name: ${{ matrix.name }}
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:

godot/.github/workflows/ios_builds.yml

@@ -12,6 +12,7 @@ jobs:
   ios-template:
     runs-on: macos-latest
     name: Template (target=template_release)
+    timeout-minutes: 60
 
     steps:
       - name: Checkout

godot/.github/workflows/linux_builds.yml

@@ -17,6 +17,7 @@ jobs:
     # Stay one LTS before latest to increase portability of Linux artifacts.
     runs-on: ubuntu-22.04
     name: ${{ matrix.name }}
+    timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
@@ -32,7 +33,9 @@ jobs:
             proj-conv: true
             api-compat: true
             artifact: true
-            cache-limit: 1
+            # Validate godot-cpp compatibility on one arbitrary editor build.
+            godot-cpp: true
+            cache-limit: 2
 
           - name: Editor with doubles and GCC sanitizers (target=editor, tests=yes, dev_build=yes, scu_build=yes, precision=double, use_asan=yes, use_ubsan=yes, linker=gold)
             cache-name: linux-editor-double-sanitizers
@@ -43,8 +46,6 @@ jobs:
             build-mono: false
             tests: true
             proj-test: true
-            # Generate an API dump for godot-cpp tests.
-            api-dump: true
             # Skip 2GiB artifact speeding up action.
             artifact: false
             cache-limit: 7
@@ -157,6 +158,13 @@ jobs:
           tests: ${{ matrix.tests }}
           scons-cache-limit: ${{ matrix.cache-limit }}
 
+      - name: Compilation (godot-cpp)
+        uses: ./.github/actions/godot-cpp-build
+        if: matrix.godot-cpp
+        with:
+          bin: ${{ matrix.bin }}
+          scons-flags: target=template_debug dev_build=yes verbose=yes
+
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save
         with:
@@ -186,12 +194,6 @@ jobs:
         with:
           name: ${{ matrix.cache-name }}
 
-      - name: Dump Godot API
-        uses: ./.github/actions/godot-api-dump
-        if: matrix.api-dump
-        with:
-          bin: ${{ matrix.bin }}
-
       - name: Unit tests
         if: matrix.tests
         run: |

godot/.github/workflows/macos_builds.yml

@@ -12,6 +12,7 @@ jobs:
   build-macos:
     runs-on: macos-latest
     name: ${{ matrix.name }}
+    timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:

godot/.github/workflows/runner.yml

@@ -44,15 +44,3 @@ jobs:
     name: 🌐 Web
     needs: static-checks
     uses: ./.github/workflows/web_builds.yml
-
-  # Third stage: Run auxiliary tests using build artifacts from previous jobs.
-
-  # Can be turned off for PRs that intentionally break compat with godot-cpp,
-  # until both the upstream PR and the matching godot-cpp changes are merged.
-  godot-cpp-test:
-    name: 🪲 Godot CPP
-    # This can be changed to depend on another platform, if we decide to use it for
-    # godot-cpp instead. Make sure to move the .github/actions/godot-api-dump step
-    # appropriately.
-    needs: linux-build
-    uses: ./.github/workflows/godot_cpp_test.yml

godot/.github/workflows/static_checks.yml

@@ -6,6 +6,7 @@ jobs:
   static-checks:
     name: Code style, file formatting, and docs
     runs-on: ubuntu-24.04
+    timeout-minutes: 30
     steps:
       - name: Checkout
         uses: actions/checkout@v4

godot/.github/workflows/web_builds.yml

@@ -13,6 +13,7 @@ jobs:
   web-template:
     runs-on: ubuntu-24.04
     name: ${{ matrix.name }}
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:

godot/.github/workflows/windows_builds.yml

@@ -15,6 +15,7 @@ jobs:
     # Windows 10 with latest image
     runs-on: windows-latest
     name: ${{ matrix.name }}
+    timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:

godot/.gitrepo

@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/V-Sekai/godot.git
-	branch = groups-4.4.2025-01-17T182926Z
-	commit = 6ec22946a4e462dedc16dd1746d0f1126e8b1f6f
-	parent = 19ec9f87d9bc698592858fdebb91d04a41fc5496
+	branch = groups-4.4.2025-01-25T054448Z
+	commit = 157b5aaf6250efe6e8c5e8e6523601c14f1f34cd
+	parent = 6c5f5b02009a4b4998e0b631e6f00f519884d75a
 	method = merge
 	cmdver = 0.4.9