hm

pkdawson · Jun 30, 2024 · e94773f · e94773f
1 parent fcd379e
commit e94773f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/.github/actions/install-godot/action.yml b/.github/actions/install-godot/action.yml
@@ -12,28 +12,40 @@ inputs:
 runs:
   using: composite
   steps:
-    # TODO: .NET templates
-
     # 4.3.0-beta.2 -> 4.3.beta2
     # https://github.com/godotengine/godot-builds/releases/download/4.3-beta2/Godot_v4.3-beta2_export_templates.tpz
+    # https://github.com/godotengine/godot-builds/releases/download/4.3-beta2/Godot_v4.3-beta2_mono_export_templates.tpz
     - if: contains(inputs.version, 'beta')
       shell: bash
       run: |
         gdver_full=$(echo ${{ inputs.version }} | sed 's:0-::' | sed 's:beta\.:beta:')
+        if [[ "${{ inputs.dotnet}}" == "true" ]]; then
+          gdver_full="$gdver_full.mono"
+        fi
         echo "gdver_full=$gdver_full" >> $GITHUB_ENV
         gdver_url=$(echo ${{ inputs.version }} | sed 's:\.0-:-:' | sed 's:beta\.:beta:')
         templates_url="https://github.com/godotengine/godot-builds/releases/download/${gdver_url}/Godot_v${gdver_url}_export_templates.tpz"
+        if [[ "${{ inputs.dotnet}}" == "true" ]]; then
+          templates_url="https://github.com/godotengine/godot-builds/releases/download/${gdver_url}/Godot_v${gdver_url}_mono_export_templates.tpz"
+        fi
         echo "templates_url=$templates_url" >> $GITHUB_ENV
 
     # 4.2.2 -> 4.2.2.stable
     # https://github.com/godotengine/godot/releases/download/4.2.2-stable/Godot_v4.2.2-stable_export_templates.tpz
+    # https://github.com/godotengine/godot/releases/download/4.2.2-stable/Godot_v4.2.2-stable_mono_export_templates.tpz
     - if: "!contains(inputs.version, 'beta')"
       shell: bash
       run: |
         gdver_full=${{ inputs.version }}.stable
+        if [[ "${{ inputs.dotnet}}" == "true" ]]; then
+          gdver_full="$gdver_full.mono"
+        fi
         echo "gdver_full=$gdver_full" >> $GITHUB_ENV
         gdver_url=${{ inputs.version }}-stable
         templates_url="https://github.com/godotengine/godot/releases/download/${gdver_url}/Godot_v${gdver_url}_export_templates.tpz"
+        if [[ "${{ inputs.dotnet}}" == "true" ]]; then
+          templates_url="https://github.com/godotengine/godot/releases/download/${gdver_url}/Godot_v${gdver_url}_mono_export_templates.tpz"
+        fi
         echo "templates_url=$templates_url" >> $GITHUB_ENV
 
     - if: runner.os == 'Linux'

diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml
@@ -280,15 +280,26 @@ jobs:
           name: ${{ steps.prep_cs.outputs.pkgfn }}
           path: ~/out
 
-  export_linux:
-    name: 🐧Export
-    runs-on: ubuntu-latest
+  gds_game:
     needs: [package]
-
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-latest, macos-14, windows-latest]
         gdver: ["4.2.2", "4.3.0-beta.2"]
+        include:
+          - os: ubuntu-latest
+            name: 🐧GdsGameProject
+            exe: GdsGameProject.x86_64
+          - os: macos-14
+            name: 🍎GdsGameProject
+            exe: GdsGameProject.app/Contents/MacOS/GdsGameProject
+          - os: windows-latest
+            name: 🪟GdsGameProject
+            exe: test.exe
+
+    name: ${{ matrix.name }} (${{ matrix.gdver }})
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
@@ -311,9 +322,10 @@ jobs:
         shell: bash
         run: |
           cd $GAMEDIR
+          ls -R
           $GODOT --headless --export-debug $RUNNER_OS
           cd export
-          ./GdsGameProject.x86_64 --headless --quit-after 10
+          ./${{ matrix.exe }} --headless --quit-after 10
           rm -rf *
 
       - name: Export Release
@@ -322,7 +334,7 @@ jobs:
           cd $GAMEDIR
           $GODOT --headless --export-release $RUNNER_OS
           cd export
-          ./GdsGameProject.x86_64 --headless --quit-after 10
+          ./${{ matrix.exe }} --headless --quit-after 10
 
   test:
     needs: [package]