Make C# first class citizen in CI.

ChloePrime · Oct 1, 2024 · 171ec8b · 171ec8b
1 parent 76241c3
commit 171ec8b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -26,17 +26,17 @@ jobs:
             tests: false
             sconsflags: arch=arm64 production=yes
 
-          - name: Template arm32 (target=template_release, arch=arm32)
-            cache-name: android-template-arm32
+          - name: Template arm32 w/ Mono (target=template_release, arch=arm32)
+            cache-name: android-template-arm32-mono
             target: template_release
             tests: false
-            sconsflags: arch=arm32
+            sconsflags: arch=arm32 module_mono_enabled=yes
 
-          - name: Template arm64 (target=template_release, arch=arm64)
-            cache-name: android-template-arm64
+          - name: Template arm64 w/ Mono (target=template_release, arch=arm64)
+            cache-name: android-template-arm64-mono
             target: template_release
             tests: false
-            sconsflags: arch=arm64
+            sconsflags: arch=arm64 module_mono_enabled=yes
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
@@ -6,7 +6,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: master
-  SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
+  SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes module_mono_enabled=yes
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-ios
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   ios-template:
     runs-on: "macos-latest"
-    name: Template (target=template_release)
+    name: Template w/ Mono (target=template_release)
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -20,12 +20,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Editor (target=editor, tests=yes)
-            cache-name: macos-editor
-            target: editor
-            tests: true
-            bin: "./bin/godot.macos.editor.universal"
-
           - name: Editor w/ Mono (target=editor)
             cache-name: macos-editor-mono
             target: editor
@@ -34,12 +28,13 @@ jobs:
             build-mono: true
             tests: false # Disabled due freeze caused by mix Mono build and CI
 
-          - name: Template (target=template_release)
+          - name: Template w/ Mono (target=template_release)
             cache-name: macos-template
             target: template_release
             tests: true
-            sconsflags: debug_symbols=no tests=yes
-            bin: "./bin/godot.macos.template_release.universal"
+            build-mono: false
+            sconsflags: debug_symbols=no tests=yes module_mono_enabled=yes
+            bin: "./bin/godot.macos.template_release.mono.universal"
 
     steps:
       - uses: actions/checkout@v4
@@ -81,6 +76,13 @@ jobs:
           cache-name: ${{ matrix.cache-name }}
         continue-on-error: true
 
+      - name: Prepare artifact
+        run: |
+          lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.mono.universal
+          rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
+          strip bin/godot.*
+          chmod +x bin/godot.*
+
       - name: Generate C# glue
         if: matrix.build-mono
         run: |
@@ -91,13 +93,6 @@ jobs:
         run: |
           ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos
 
-      - name: Prepare artifact
-        run: |
-          lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal
-          rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
-          strip bin/godot.*
-          chmod +x bin/godot.*
-
       - name: Upload artifact
         uses: ./.github/actions/upload-artifact
         with:

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -40,12 +40,13 @@ jobs:
             tests: false # Disabled due freeze caused by mix Mono build and CI
             artifact: true
 
-          - name: Template (target=template_release)
+          - name: Template w/ Mono (target=template_release)
             cache-name: windows-template
             target: template_release
             tests: true
-            sconsflags: debug_symbols=no tests=yes
-            bin: "./bin/godot.windows.template_release.x86_64.console.exe"
+            build-mono: false
+            sconsflags: debug_symbols=no tests=yes module_mono_enabled=yes
+            bin: "./bin/godot.windows.template_release.x86_64.mono.console.exe"
 
     steps:
       - uses: actions/checkout@v4