Fix template usage (#713)

* Fix template usage
utopia-rise · Oct 7, 2024 · 33e5c85 · 33e5c85
1 parent 53e8fee
commit 33e5c85
Show file tree

Hide file tree

Showing 22 changed files with 80 additions and 24 deletions.
diff --git a/.github/workflows/assemble_export_templates.yml b/.github/workflows/assemble_export_templates.yml
@@ -6,6 +6,8 @@ on:
         type: string
       godot-version:
         type: string
+      build-version:
+          type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-export_templates_assemble
@@ -51,7 +53,7 @@ jobs:
 
       - name: Move linux x86_64 debug export template
         shell: sh
-        run: mv godot.linuxbsd.template_debug.x86_64 templates/linux_debug.x86_64
+        run: mv godot.linuxbsd.template_debug.x86_64.jvm.${{ inputs.build-version }} templates/linux_debug.x86_64
 
       - name: Download linux x86_64 release export template
         uses: actions/download-artifact@v4
@@ -61,7 +63,7 @@ jobs:
 
       - name: Move linux x86_64 release export template
         shell: sh
-        run: mv godot.linuxbsd.template_release.x86_64 templates/linux_release.x86_64
+        run: mv godot.linuxbsd.template_release.x86_64.jvm.${{ inputs.build-version }} templates/linux_release.x86_64
 
       - name: Download windows x86_64 debug export template
         uses: actions/download-artifact@v4
@@ -71,7 +73,7 @@ jobs:
 
       - name: Move windows x86_64 debug export template
         shell: sh
-        run: mv godot.windows.template_debug.x86_64.exe templates/windows_debug_x86_64.exe
+        run: mv godot.windows.template_debug.x86_64.jvm.${{ inputs.build-version }}.exe templates/windows_debug_x86_64.exe
 
       - name: Download windows x86_64 release export template
         uses: actions/download-artifact@v4
@@ -81,7 +83,7 @@ jobs:
 
       - name: Move windows x86_64 release export template
         shell: sh
-        run: mv godot.windows.template_release.x86_64.exe templates/windows_release_x86_64.exe
+        run: mv godot.windows.template_release.x86_64.jvm.${{ inputs.build-version }}.exe templates/windows_release_x86_64.exe
 
       - name: Download macos debug export template
         uses: actions/download-artifact@v4
@@ -95,7 +97,7 @@ jobs:
 
       - name: Create version.txt
         run: |
-          refVersion=godot-kotlin-jvm-${{ inputs.godot-kotlin-jvm-version }}
+          refVersion=${{ inputs.godot-version }}jvm-${{ inputs.build-version }}
           templatesVersion=${refVersion//-/.} #replace `-` with `.` in templates version
           echo "$templatesVersion" > templates/version.txt
         shell: bash

diff --git a/.github/workflows/assemble_ios.yml b/.github/workflows/assemble_ios.yml
@@ -6,6 +6,8 @@ on:
         type: string
       godot-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-ios_assemble

diff --git a/.github/workflows/assemble_linux.yml b/.github/workflows/assemble_linux.yml
@@ -6,6 +6,8 @@ on:
         type: string
       godot-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_assemble

diff --git a/.github/workflows/assemble_macos.yml b/.github/workflows/assemble_macos.yml
@@ -6,6 +6,8 @@ on:
         type: string
       godot-version:
         type: string
+      build-version:
+          type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_assemble
@@ -49,8 +51,8 @@ jobs:
       - name: Create ${{ matrix.target }} OSX universal binary
         uses: ./.github/actions/create-macos-universal-binary
         with:
-          amd-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.x86_64
-          arm-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.arm64
+          amd-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.x86_64.jvm.${{ inputs.build-version }}
+          arm-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.arm64.jvm.${{ inputs.build-version }}
           universal-output-binary: godot.macos.editor.${{ matrix.target }}.universal
 
       - name: Upload ${{ matrix.target }} macos universal artifact
@@ -142,8 +144,8 @@ jobs:
       - name: Create macos universal binary
         uses: ./.github/actions/create-macos-universal-binary
         with:
-          amd-64-binary: godot.macos.template_${{ matrix.target }}.x86_64
-          arm-64-binary: godot.macos.template_${{ matrix.target }}.arm64
+          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 universal artifact

diff --git a/.github/workflows/assemble_windows.yml b/.github/workflows/assemble_windows.yml
@@ -6,6 +6,8 @@ on:
         type: string
       godot-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows_assemble
@@ -32,7 +34,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: editor_${{ matrix.target }}_windows_${{ matrix.arch }}
-          path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
+          path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.jvm.${{ inputs.build-version }}
 
       - name: Download ${{ matrix.target }} bootstrap jar
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-android_build

diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -1,6 +1,5 @@
 name: Deploy docs
 
-
 on:
   workflow_call:
 

diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_tests

diff --git a/.github/workflows/test_linux_exports.yml b/.github/workflows/test_linux_exports.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_exports_tests
@@ -61,7 +63,7 @@ jobs:
         run: |
           chmod +x harness/tests/bin/godot.*
           mkdir -p harness/tests/export
-          mv godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64 harness/tests/godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64
+          mv godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64.jvm.${{ inputs.build-version }} harness/tests/godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64
 
       - name: Build tests project
         run: |

diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_tests

diff --git a/.github/workflows/test_macos_exports.yml b/.github/workflows/test_macos_exports.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_exports_tests

diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows_tests

diff --git a/.github/workflows/test_windows_exports.yml b/.github/workflows/test_windows_exports.yml
@@ -6,6 +6,8 @@ on:
         type: string
       jvm-version:
         type: string
+      build-version:
+        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows_exports_tests
@@ -60,7 +62,7 @@ jobs:
       - name: Prepare export
         run: |
           mkdir -p harness/tests/export
-          mv godot.windows.template_${{ matrix.bootstrap-target }}.x86_64.exe harness/tests/godot.windows.template_${{ matrix.bootstrap-target }}.x86_64.exe
+          mv godot.windows.template_${{ matrix.bootstrap-target }}.x86_64.jvm.${{ inputs.build-version }}.exe harness/tests/godot.windows.template_${{ matrix.bootstrap-target }}.x86_64.exe
 
       - name: Build tests project
         run: |

diff --git a/.github/workflows/trigger_dev.yml b/.github/workflows/trigger_dev.yml
@@ -66,7 +66,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
+      godot-kotlin-jvm-version: "0.11.0-4.3"
       godot-version: "4.3-stable"
+      build-version: "0.11.0"
       jvm-version: "17"
 
   build-jvm:

diff --git a/.github/workflows/trigger_on_pull_request.yml b/.github/workflows/trigger_on_pull_request.yml
@@ -14,8 +14,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
-      godot-kotlin-jvm-version: "0.10.0-4.3.0"
+      godot-kotlin-jvm-version: "0.11.0-4.3"
       godot-version: "4.3-stable"
+      build-version: "0.11.0"
       jvm-version: "17"
 
   build-jvm:
@@ -35,6 +36,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   build-ios:
     name: 🍏 Build iOS
@@ -78,6 +80,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-ios:
     name: 🍏 Assemble ios
@@ -88,6 +91,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-linux:
     name: 🐧 Assemble linux
@@ -99,6 +103,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-windows:
     name: 🪟 Assemble windows
@@ -110,6 +115,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-export-templates:
     name: 🤖+🍏+🐧+🍎+🪟 Assemble export templates
@@ -124,6 +130,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   test-linux:
     name: 🐧 Test Linux
@@ -135,6 +142,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   test-macos:
     name: 🍎 Test Macos
@@ -146,6 +154,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   test-windows:
     name: 🪟 Test Windows
@@ -157,6 +166,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   test-linux-exports:
     name: 🐧 Test Linux Exports
@@ -168,6 +178,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   test-macos-exports:
     name: 🍎 Test Macos Exports
@@ -179,6 +190,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   test-windows-exports:
     name: 🪟 Test Windows Exports
@@ -190,3 +202,4 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
diff --git a/.github/workflows/trigger_on_push_master.yml b/.github/workflows/trigger_on_push_master.yml
@@ -19,8 +19,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
-      godot-kotlin-jvm-version: "0.10.0-4.3.0"
+      godot-kotlin-jvm-version: "0.11.0-4.3"
       godot-version: "4.3-stable"
+      build-version: "0.11.0"
       jvm-version: "17"
 
   build-jvm:
@@ -40,6 +41,7 @@ jobs:
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
       jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   build-ios:
     name: 🍏 Build iOS
@@ -83,6 +85,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-ios:
     name: 🍏 Assemble ios
@@ -93,6 +96,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-linux:
     name: 🐧 Assemble linux
@@ -104,6 +108,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-windows:
     name: 🪟 Assemble windows
@@ -115,6 +120,7 @@ jobs:
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
 
   assemble-export-templates:
     name: 🤖+🍏+🐧+🍎+🪟 Assemble export templates
@@ -128,4 +134,5 @@ jobs:
       - build-windows # uploads finished export template directly
     with:
       godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
-      godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}