Skip to content

Commit 33e5c85

Browse files
CedNaruCedNaru
authored
Fix template usage (#713)
* Fix template usage
1 parent 53e8fee commit 33e5c85

22 files changed

+80
-24
lines changed

‎.github/workflows/assemble_export_templates.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
godot-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-export_templates_assemble
@@ -51,7 +53,7 @@ jobs:
5153

5254
- name: Move linux x86_64 debug export template
5355
shell: sh
54-
run: mv godot.linuxbsd.template_debug.x86_64 templates/linux_debug.x86_64
56+
run: mv godot.linuxbsd.template_debug.x86_64.jvm.${{ inputs.build-version }} templates/linux_debug.x86_64
5557

5658
- name: Download linux x86_64 release export template
5759
uses: actions/download-artifact@v4
@@ -61,7 +63,7 @@ jobs:
6163

6264
- name: Move linux x86_64 release export template
6365
shell: sh
64-
run: mv godot.linuxbsd.template_release.x86_64 templates/linux_release.x86_64
66+
run: mv godot.linuxbsd.template_release.x86_64.jvm.${{ inputs.build-version }} templates/linux_release.x86_64
6567

6668
- name: Download windows x86_64 debug export template
6769
uses: actions/download-artifact@v4
@@ -71,7 +73,7 @@ jobs:
7173

7274
- name: Move windows x86_64 debug export template
7375
shell: sh
74-
run: mv godot.windows.template_debug.x86_64.exe templates/windows_debug_x86_64.exe
76+
run: mv godot.windows.template_debug.x86_64.jvm.${{ inputs.build-version }}.exe templates/windows_debug_x86_64.exe
7577

7678
- name: Download windows x86_64 release export template
7779
uses: actions/download-artifact@v4
@@ -81,7 +83,7 @@ jobs:
8183

8284
- name: Move windows x86_64 release export template
8385
shell: sh
84-
run: mv godot.windows.template_release.x86_64.exe templates/windows_release_x86_64.exe
86+
run: mv godot.windows.template_release.x86_64.jvm.${{ inputs.build-version }}.exe templates/windows_release_x86_64.exe
8587

8688
- name: Download macos debug export template
8789
uses: actions/download-artifact@v4
@@ -95,7 +97,7 @@ jobs:
9597

9698
- name: Create version.txt
9799
run: |
98-
refVersion=godot-kotlin-jvm-${{ inputs.godot-kotlin-jvm-version }}
100+
refVersion=${{ inputs.godot-version }}jvm-${{ inputs.build-version }}
99101
templatesVersion=${refVersion//-/.} #replace `-` with `.` in templates version
100102
echo "$templatesVersion" > templates/version.txt
101103
shell: bash

‎.github/workflows/assemble_ios.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
godot-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-ios_assemble

‎.github/workflows/assemble_linux.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
godot-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_assemble

‎.github/workflows/assemble_macos.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
godot-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_assemble
@@ -49,8 +51,8 @@ jobs:
4951
- name: Create ${{ matrix.target }} OSX universal binary
5052
uses: ./.github/actions/create-macos-universal-binary
5153
with:
52-
amd-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.x86_64
53-
arm-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.arm64
54+
amd-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.x86_64.jvm.${{ inputs.build-version }}
55+
arm-64-binary: godot.macos.editor${{ matrix.editor-target-insert }}.arm64.jvm.${{ inputs.build-version }}
5456
universal-output-binary: godot.macos.editor.${{ matrix.target }}.universal
5557

5658
- name: Upload ${{ matrix.target }} macos universal artifact
@@ -142,8 +144,8 @@ jobs:
142144
- name: Create macos universal binary
143145
uses: ./.github/actions/create-macos-universal-binary
144146
with:
145-
amd-64-binary: godot.macos.template_${{ matrix.target }}.x86_64
146-
arm-64-binary: godot.macos.template_${{ matrix.target }}.arm64
147+
amd-64-binary: godot.macos.template_${{ matrix.target }}.x86_64.jvm.${{ inputs.build-version }}
148+
arm-64-binary: godot.macos.template_${{ matrix.target }}.arm64.jvm.${{ inputs.build-version }}
147149
universal-output-binary: godot.macos.template_${{ matrix.target }}.universal
148150

149151
- name: Upload ${{ matrix.target }} macos universal artifact

‎.github/workflows/assemble_windows.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
godot-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows_assemble
@@ -32,7 +34,7 @@ jobs:
3234
uses: actions/download-artifact@v4
3335
with:
3436
name: editor_${{ matrix.target }}_windows_${{ matrix.arch }}
35-
path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
37+
path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.jvm.${{ inputs.build-version }}
3638

3739
- name: Download ${{ matrix.target }} bootstrap jar
3840
uses: actions/download-artifact@v4

‎.github/workflows/build_android.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
jvm-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-android_build

‎.github/workflows/deploy_docs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Deploy docs
22

3-
43
on:
54
workflow_call:
65

‎.github/workflows/test_linux.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
jvm-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_tests

‎.github/workflows/test_linux_exports.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
jvm-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_exports_tests
@@ -61,7 +63,7 @@ jobs:
6163
run: |
6264
chmod +x harness/tests/bin/godot.*
6365
mkdir -p harness/tests/export
64-
mv godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64 harness/tests/godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64
66+
mv godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64.jvm.${{ inputs.build-version }} harness/tests/godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64
6567
6668
- name: Build tests project
6769
run: |

‎.github/workflows/test_macos.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
type: string
77
jvm-version:
88
type: string
9+
build-version:
10+
type: string
911

1012
concurrency:
1113
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_tests

0 commit comments

Comments
 (0)