.github/workflows/android.yml

@@ -37,8 +37,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # * Standard arm64
-
           - name: Template (arm64, debug)
             arch: arm64
             target: template_debug
@@ -49,8 +47,6 @@ jobs:
             target: template_release
             dotnet: false
 
-          # * Standard arm32
-
           - name: Template (arm32, debug)
             arch: arm32
             target: template_debug
@@ -61,8 +57,6 @@ jobs:
             target: template_release
             dotnet: false
 
-          # * Standard x86_64
-
           - name: Template (x86_64, debug)
             arch: x86_64
             target: template_debug
@@ -73,8 +67,6 @@ jobs:
             target: template_release
             dotnet: false
 
-          # * Standard x86_32
-
           - name: Template (x86_32, debug)
             arch: x86_32
             target: template_debug
@@ -85,56 +77,8 @@ jobs:
             target: template_release
             dotnet: false
 
-          # * .NET arm64
-
-          - name: Template .NET (arm64, debug)
-            arch: arm64
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (arm64, release)
-            arch: arm64
-            target: template_release
-            dotnet: true
-
-          # * .NET arm32
-
-          - name: Template .NET (arm32, debug)
-            arch: arm32
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (arm32, release)
-            arch: arm32
-            target: template_release
-            dotnet: true
-
-          # * .NET x86_64
-
-          - name: Template .NET (x86_64, debug)
-            arch: x86_64
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (x86_64, release)
-            arch: x86_64
-            target: template_release
-            dotnet: true
-
-          # * .NET x86_32
-
-          - name: Template .NET (x86_32, debug)
-            arch: x86_32
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (x86_32, release)
-            arch: x86_32
-            target: template_release
-            dotnet: true
-
     env:
-      BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}}${{  matrix.dotnet == true && '.mono' || ''  }}
+      BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}} #${{  matrix.build-mono == true && '.mono' || ''  }}
 
     steps:
       - name: Clone Godot
@@ -179,28 +123,19 @@ jobs:
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          scons platform=android target=${{matrix.target}} arch=${{matrix.arch}} module_mono_enabled=${{matrix.dotnet}} ${{env.SCONSFLAGS}}
+          scons platform=android target=${{matrix.target}} arch=${{matrix.arch}} ${{env.SCONSFLAGS}}
           ls platform/android/java/lib/libs/*
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tmp-android${{matrix.dotnet == true && '-dotnet' || ''}}-templates-${{strategy.job-index}}
+          name: tmp-android-templates-${{strategy.job-index}}
           path: platform/android/java/lib/libs/*
 
   make-android-package:
     runs-on: "ubuntu-20.04"
+    name: Make Android package
     needs: android-builds
-    name: ${{ matrix.name }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Package Android templates
-            dotnet: false
-          - name: Package Android .NET templates
-            dotnet: true
 
     steps:
       - name: Clone Godot
@@ -221,7 +156,7 @@ jobs:
       - name: Download Android template builds
         uses: actions/download-artifact@v4
         with:
-          pattern: tmp-android${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          pattern: tmp-android-templates-*
           merge-multiple: true
           path: platform/android/java/lib/libs/
 
@@ -259,18 +194,18 @@ jobs:
       - name: Delete Android template builds
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: tmp-android${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          name: tmp-android-templates-*
           useGlob: true
           failOnError: false
 
       - name: Upload Android libs
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.dotnet == true && '.dotnet' || ''}}.android-lib
+          name: ${{env.NAME_PREFIX}}.android-lib
           path: bin/godot-lib.*
 
       - name: Upload Android templates
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.dotnet == true && '.dotnet' || ''}}.export-templates.android
+          name: ${{env.NAME_PREFIX}}.export-templates.android
           path: out/*

.github/workflows/ios.yml

@@ -50,13 +50,13 @@ jobs:
             ios_simulator: false
             dotnet: false
 
-          - name: Simulator (x86_64, release)
+          - name: Simulator Lib (x86_64, release)
             target: template_release
             arch: x86_64
             ios_simulator: true
             dotnet: false
 
-          - name: Simulator (x86_64, debug)
+          - name: Simulator Lib (x86_64, debug)
             target: template_debug
             arch: x86_64
             ios_simulator: true
@@ -74,32 +74,8 @@ jobs:
           #   arch: arm64
           #   ios_simulator: true
 
-          - name: Template .NET (arm64, release)
-            target: template_release
-            arch: arm64
-            ios_simulator: false
-            dotnet: true
-
-          - name: Template .NET (arm64, debug)
-            target: template_debug
-            arch: arm64
-            ios_simulator: false
-            dotnet: true
-
-          - name: Simulator .NET (x86_64, release)
-            target: template_release
-            arch: x86_64
-            ios_simulator: true
-            dotnet: true
-
-          - name: Simulator .NET (x86_64, debug)
-            target: template_debug
-            arch: x86_64
-            ios_simulator: true
-            dotnet: true
-
     env:
-      BIN: godot.ios.${{matrix.target}}.${{matrix.arch}}${{  matrix.dotnet == true && '.mono' || ''  }}
+      BIN: godot.ios.${{matrix.target}}.${{matrix.arch}}
 
     steps:
       - name: Clone Godot
@@ -152,28 +128,19 @@ jobs:
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          scons platform=ios target=${{matrix.target}} arch=${{matrix.arch}} ios_simulator=${{matrix.ios_simulator}} module_mono_enabled=${{matrix.dotnet}} ${{env.SCONSFLAGS}}
+          scons platform=ios target=${{matrix.target}} arch=${{matrix.arch}} ios_simulator=${{matrix.ios_simulator}} ${{env.SCONSFLAGS}}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tmp-ios${{matrix.dotnet == true && '-dotnet' || ''}}-templates-${{strategy.job-index}}
+          name: tmp-ios-templates-${{strategy.job-index}}
           path: bin/*
 
   package-ios-templates:
     runs-on: "macos-latest"
-    name: ${{ matrix.name }}
+    name: Package iOS templates
     needs: ios-builds
 
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Package iOS templates
-            dotnet: false
-          - name: Package iOS .NET templates
-            dotnet: true
-
     steps:
       - name: Clone Godot
         uses: actions/checkout@v4
@@ -197,7 +164,7 @@ jobs:
       - name: Download templates artifact
         uses: actions/download-artifact@v4
         with:
-          pattern: tmp-ios${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          pattern: tmp-ios-templates-*
           merge-multiple: true
           path: bin/
 
@@ -229,12 +196,12 @@ jobs:
       - name: Upload template bundle
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.dotnet == true && '.dotnet' || ''}}.export-templates.ios
+          name: ${{env.NAME_PREFIX}}.export-templates.ios
           path: out/*
 
       - name: Delete templates artifact
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: tmp-ios${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          name: tmp-ios-templates-*
           useGlob: true
           failOnError: false