chore: Update to godot 4.6 (#895)

* chore: Update to godot 4.6

---------

Co-authored-by: CedNaru <cednaru.dev@gmail.com>
Co-authored-by: Pierre-Thomas Meisels <dev001@infra.utopia-rise.com>

Author: 3 people

.github/workflows/assemble_ios.yml

@@ -71,7 +71,7 @@ jobs:
 
       - name: Create iOS template app
         run: |
-          cp -r misc/dist/ios_xcode .
+          cp -r misc/dist/apple_embedded_xcode ios_xcode
           cp -r MoltenVK/Package/Release/MoltenVK/static/MoltenVK.xcframework ios_xcode/
           cp libgodot.ios.template_release.arm64.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
           cp libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a

.github/workflows/assemble_macos.yml

@@ -8,6 +8,9 @@ on:
         type: string
       build-version:
           type: string
+      build-test-templates:
+        type: boolean
+        default: true
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_assemble
@@ -183,4 +186,86 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: export_template_all_macos
-          path: export_template_all_macos.zip
+          path: export_template_all_macos.zip
+
+  create-macos-test-export-template-universal:
+    if: ${{ inputs.build-test-templates }}
+    runs-on: macos-latest
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Create test export template universal binary release
+            target: release
+
+          - name: Create test export template universal binary debug
+            target: debug
+    steps:
+      - name: Clone Godot JVM module.
+        uses: actions/checkout@v4
+
+      - name: Download ${{ matrix.target }} x86_64 test export_template
+        uses: actions/download-artifact@v4
+        with:
+          name: export_template_test_${{ matrix.target }}_macos_x86_64
+          path: "./"
+
+      - name: Download ${{ matrix.target }} arm64 test export_template
+        uses: actions/download-artifact@v4
+        with:
+          name: export_template_test_${{ matrix.target }}_macos_arm64
+          path: "./"
+
+      - name: Create macos universal binary
+        uses: ./.github/actions/create-macos-universal-binary
+        with:
+          amd-64-binary: godot.macos.template_${{ matrix.target }}.x86_64.jvm.${{ inputs.build-version }}
+          arm-64-binary: godot.macos.template_${{ matrix.target }}.arm64.jvm.${{ inputs.build-version }}
+          universal-output-binary: godot.macos.template_${{ matrix.target }}.universal
+
+      - name: Upload ${{ matrix.target }} macos test universal artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: export_template_test_${{ matrix.target }}_macos_universal
+          path: godot.macos.template_${{ matrix.target }}.universal
+
+  create-macos-test-export-template-app:
+    if: ${{ inputs.build-test-templates }}
+    needs: [ create-macos-test-export-template-universal ]
+    runs-on: macos-latest
+    name: Create macos test export template app
+    steps:
+      - name: Clone Godot Engine
+        uses: actions/checkout@v4
+        with:
+          repository: godotengine/godot
+          ref: ${{ inputs.godot-version }}
+
+      - name: Download debug test export_template
+        uses: actions/download-artifact@v4
+        with:
+          name: export_template_test_debug_macos_universal
+          path: .
+
+      - name: Download release test export_template
+        uses: actions/download-artifact@v4
+        with:
+          name: export_template_test_release_macos_universal
+          path: .
+
+      - name: Create MacOs test template app
+        run: |
+          cp -r misc/dist/macos_template.app .
+          mkdir -p macos_template.app/Contents/MacOS
+          cp godot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal
+          cp godot.macos.template_debug.universal macos_template.app/Contents/MacOS/godot_macos_debug.universal
+          chmod +x macos_template.app/Contents/MacOS/godot_macos*
+          zip -q -9 -r export_template_test_all_macos.zip macos_template.app
+        shell: bash
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: export_template_test_all_macos
+          path: export_template_test_all_macos.zip

.github/workflows/build_linux.yml

@@ -4,43 +4,44 @@ on:
     inputs:
       godot-version:
         type: string
+      build-test-templates:
+        type: boolean
+        default: true
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_build
   cancel-in-progress: true
 
 jobs:
+  setup-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - id: set-matrix
+        run: |
+          MATRIX='{"include":[
+            {"name":"Build editor release x86_64 (target=editor)","cache-name":"editor_release_linux_x86_64","target":"editor","scons-flags":""},
+            {"name":"Build editor debug (target=editor, debug_symbols=true )","cache-name":"editor_debug_linux_x86_64","target":"editor","scons-flags":"debug_symbols=true"},
+            {"name":"Build editor dev (target=editor, dev_build=yes, debug_symbols=true )","cache-name":"editor_dev_linux_x86_64","target":"editor","scons-flags":"dev_build=yes debug_symbols=true"},
+            {"name":"Build release template x86_64","cache-name":"export_template_release_linux_x86_64","target":"template_release","scons-flags":""},
+            {"name":"Build debug template x86_64","cache-name":"export_template_debug_linux_x86_64","target":"template_debug","scons-flags":""}
+          ]}'
+          if [ "${{ inputs.build-test-templates }}" == "true" ]; then
+            MATRIX=$(echo "$MATRIX" | jq -c '.include += [
+              {"name":"Build release template x86_64 (test)","cache-name":"export_template_test_release_linux_x86_64","target":"template_release","scons-flags":"disable_path_overrides=no"},
+              {"name":"Build debug template x86_64 (test)","cache-name":"export_template_test_debug_linux_x86_64","target":"template_debug","scons-flags":"disable_path_overrides=no"}
+            ]')
+          fi
+          echo "matrix=$(echo $MATRIX | jq -c '.')" >> $GITHUB_OUTPUT
+
   build-linux:
+    needs: setup-matrix
     runs-on: ubuntu-22.04 # use the oldest ubuntu version still available to github actions for the best backwards compatibility
     name: ${{ matrix.name }}
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - name: Build editor release x86_64 (target=editor)
-            cache-name: editor_release_linux_x86_64
-            target: editor
-            scons-flags: ''
-
-          - name: Build editor debug (target=editor, debug_symbols=true )
-            cache-name: editor_debug_linux_x86_64
-            target: editor
-            scons-flags: debug_symbols=true
-
-          - name: Build editor dev (target=editor, dev_build=yes, debug_symbols=true )
-            cache-name: editor_dev_linux_x86_64
-            target: editor
-            scons-flags: dev_build=yes debug_symbols=true
-
-          - name: Build release template x86_64
-            cache-name: export_template_release_linux_x86_64
-            target: template_release
-            scons-flags: ''
-
-          - name: Build debug template x86_64
-            cache-name: export_template_debug_linux_x86_64
-            target: template_debug
-            scons-flags: ''
+      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
 
     steps:
       - name: Maximize build space

.github/workflows/build_macos.yml

@@ -4,68 +4,51 @@ on:
     inputs:
       godot-version:
         type: string
+      build-test-templates:
+        type: boolean
+        default: true
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_build
   cancel-in-progress: true
 
 jobs:
+  setup-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - id: set-matrix
+        run: |
+          MATRIX='{"include":[
+            {"name":"Build editor release x86_64 (target=editor)","cache-name":"editor_release_macos_x86_64","target":"editor","scons-flags":"arch=x86_64"},
+            {"name":"Build editor debug x86_64 (target=editor, debug_symbols=true )","cache-name":"editor_debug_macos_x86_64","target":"editor","scons-flags":"arch=x86_64 debug_symbols=true"},
+            {"name":"Build editor dev x86_64 (target=editor, dev_build=yes, debug_symbols=true )","cache-name":"editor_dev_macos_x86_64","target":"editor","scons-flags":"arch=x86_64 dev_build=yes debug_symbols=true"},
+            {"name":"Build release template x86_64","cache-name":"export_template_release_macos_x86_64","target":"template_release","scons-flags":"arch=x86_64"},
+            {"name":"Build debug template x86_64","cache-name":"export_template_debug_macos_x86_64","target":"template_debug","scons-flags":"arch=x86_64"},
+            {"name":"Build editor release arm64 (target=editor)","cache-name":"editor_release_macos_arm64","target":"editor","scons-flags":"arch=arm64"},
+            {"name":"Build editor debug arm64 (target=editor, debug_symbols=true )","cache-name":"editor_debug_macos_arm64","target":"editor","scons-flags":"arch=arm64 debug_symbols=true"},
+            {"name":"Build editor dev arm64 (target=editor, dev_build=yes, debug_symbols=true )","cache-name":"editor_dev_macos_arm64","target":"editor","scons-flags":"arch=arm64 dev_build=yes debug_symbols=true"},
+            {"name":"Build release template arm64","cache-name":"export_template_release_macos_arm64","target":"template_release","scons-flags":"arch=arm64"},
+            {"name":"Build debug template arm64","cache-name":"export_template_debug_macos_arm64","target":"template_debug","scons-flags":"arch=arm64"}
+          ]}'
+          if [ "${{ inputs.build-test-templates }}" == "true" ]; then
+            MATRIX=$(echo "$MATRIX" | jq -c '.include += [
+              {"name":"Build release template x86_64 (test)","cache-name":"export_template_test_release_macos_x86_64","target":"template_release","scons-flags":"arch=x86_64 disable_path_overrides=no"},
+              {"name":"Build debug template x86_64 (test)","cache-name":"export_template_test_debug_macos_x86_64","target":"template_debug","scons-flags":"arch=x86_64 disable_path_overrides=no"},
+              {"name":"Build release template arm64 (test)","cache-name":"export_template_test_release_macos_arm64","target":"template_release","scons-flags":"arch=arm64 disable_path_overrides=no"},
+              {"name":"Build debug template arm64 (test)","cache-name":"export_template_test_debug_macos_arm64","target":"template_debug","scons-flags":"arch=arm64 disable_path_overrides=no"}
+            ]')
+          fi
+          echo "matrix=$(echo $MATRIX | jq -c '.')" >> $GITHUB_OUTPUT
+
   build-macos:
+    needs: setup-matrix
     runs-on: macos-latest
     name: ${{ matrix.name }}
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - name: Build editor release x86_64 (target=editor)
-            cache-name: editor_release_macos_x86_64
-            target: editor
-            scons-flags: arch=x86_64
-
-          - name: Build editor debug x86_64 (target=editor, debug_symbols=true )
-            cache-name: editor_debug_macos_x86_64
-            target: editor
-            scons-flags: arch=x86_64 debug_symbols=true
-
-          - name: Build editor dev x86_64 (target=editor, dev_build=yes, debug_symbols=true )
-            cache-name: editor_dev_macos_x86_64
-            target: editor
-            scons-flags: arch=x86_64 dev_build=yes debug_symbols=true
-
-          - name: Build release template x86_64
-            cache-name: export_template_release_macos_x86_64
-            target: template_release
-            scons-flags: arch=x86_64
-
-          - name: Build debug template x86_64
-            cache-name: export_template_debug_macos_x86_64
-            target: template_debug
-            scons-flags: arch=x86_64
-
-          - name: Build editor release arm64 (target=editor)
-            cache-name: editor_release_macos_arm64
-            target: editor
-            scons-flags: arch=arm64
-
-          - name: Build editor debug arm64 (target=editor, debug_symbols=true )
-            cache-name: editor_debug_macos_arm64
-            target: editor
-            scons-flags: arch=arm64 debug_symbols=true
-
-          - name: Build editor dev arm64 (target=editor, dev_build=yes, debug_symbols=true )
-            cache-name: editor_dev_macos_arm64
-            target: editor
-            scons-flags: arch=arm64 dev_build=yes debug_symbols=true
-
-          - name: Build release template arm64
-            cache-name: export_template_release_macos_arm64
-            target: template_release
-            scons-flags: arch=arm64
-
-          - name: Build debug template arm64
-            cache-name: export_template_debug_macos_arm64
-            target: template_debug
-            scons-flags: arch=arm64
+      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
 
     steps:
       - name: Clone Godot Engine

.github/workflows/build_windows.yml

@@ -4,6 +4,9 @@ on:
     inputs:
       godot-version:
         type: string
+      build-test-templates:
+        type: boolean
+        default: true
 
 env:
   SCONS_CACHE_MSVC_CONFIG: true
@@ -13,43 +16,36 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  setup-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - id: set-matrix
+        run: |
+          MATRIX='{"include":[
+            {"name":"Build editor release (target=editor)","cache-name":"editor_release_windows_x86_64","target":"editor","should-clean":true,"scons-flags":""},
+            {"name":"Build editor debug (target=editor, debug_symbols=true )","cache-name":"editor_debug_windows_x86_64","target":"editor","should-clean":false,"scons-flags":"debug_symbols=true"},
+            {"name":"Build editor dev (target=editor, dev_build=yes, debug_symbols=true )","cache-name":"editor_dev_windows_x86_64","target":"editor","should-clean":false,"scons-flags":"dev_build=yes debug_symbols=true"},
+            {"name":"Build release template","cache-name":"export_template_release_windows_x86_64","target":"template_release","should-clean":true,"scons-flags":""},
+            {"name":"Build debug template","cache-name":"export_template_debug_windows_x86_64","target":"template_debug","should-clean":false,"scons-flags":""}
+          ]}'
+          if [ "${{ inputs.build-test-templates }}" == "true" ]; then
+            MATRIX=$(echo "$MATRIX" | jq -c '.include += [
+              {"name":"Build release template (test)","cache-name":"export_template_test_release_windows_x86_64","target":"template_release","should-clean":true,"scons-flags":"disable_path_overrides=no"},
+              {"name":"Build debug template (test)","cache-name":"export_template_test_debug_windows_x86_64","target":"template_debug","should-clean":false,"scons-flags":"disable_path_overrides=no"}
+            ]')
+          fi
+          echo "matrix=$(echo $MATRIX | jq -c '.')" >> $GITHUB_OUTPUT
+
   build-windows:
+    needs: setup-matrix
     # Windows 10 with latest image
     runs-on: windows-latest
     name: ${{ matrix.name }}
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - name: Build editor release (target=editor)
-            cache-name: editor_release_windows_x86_64
-            target: editor
-            should-clean: true
-            scons-flags: ''
-
-          - name: Build editor debug (target=editor, debug_symbols=true )
-            cache-name: editor_debug_windows_x86_64
-            target: editor
-            should-clean: false
-            scons-flags: debug_symbols=true
-
-          - name: Build editor dev (target=editor, dev_build=yes, debug_symbols=true )
-            cache-name: editor_dev_windows_x86_64
-            target: editor
-            should-clean: false
-            scons-flags: dev_build=yes debug_symbols=true
-
-          - name: Build release template
-            cache-name: export_template_release_windows_x86_64
-            target: template_release
-            should-clean: true
-            scons-flags: ''
-
-          - name: Build debug template
-            cache-name: export_template_debug_windows_x86_64
-            target: template_debug
-            should-clean: false
-            scons-flags: ''
+      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
 
     steps:
       - name: Clone Godot Engine
@@ -72,6 +68,10 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
+      - name: Download Direct3D SDK components
+        run: |
+          python ./misc/scripts/install_d3d12_sdk_windows.py
+
       - name: Setup MSVC problem matcher
         uses: ammaraskar/msvc-problem-matcher@master
 

.github/workflows/test_linux_exports.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Download linux x86_64 ${{ matrix.jvm-target }} export template
         uses: actions/download-artifact@v4
         with:
-          name: export_template_${{ matrix.jvm-target }}_linux_x86_64
+          name: export_template_test_${{ matrix.jvm-target }}_linux_x86_64
           path: "./"
 
       - name: Prepare export

.github/workflows/test_macos_exports.yml

@@ -50,14 +50,14 @@ jobs:
       - name: Download macos export template
         uses: actions/download-artifact@v4
         with:
-          name: export_template_all_macos
+          name: export_template_test_all_macos
           path: "./"
 
       - name: Prepare export
         run: |
           chmod +x harness/tests/bin/godot.*
           mkdir -p harness/tests/export
-          mv export_template_all_macos.zip harness/tests/export_template_all_macos.zip
+          mv export_template_test_all_macos.zip harness/tests/export_template_all_macos.zip
 
       - name: Build tests project
         run: |