Skip to content

Commit ebe5a79

Browse files
chippmannchippmann
authored
Fix android export templates and fix export template target version (#581)
1 parent 1dfa11d commit ebe5a79

6 files changed

+119
-26
lines changed

‎.github/workflows/check-pr-engine-editor-debug-and-tests.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ jobs:
3131
with:
3232
repository: godotengine/godot
3333
ref: 4.2-stable
34+
# TODO: remove once on godot 4.2.2 or newer!
35+
- name: Cherry pick macos fix
36+
run: |
37+
git fetch -a
38+
git config --global user.email "mario@super.com"
39+
git config --global user.name "Super Mario"
40+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
3441
- name: Clone Godot JVM module.
3542
uses: actions/checkout@v2
3643
with:
@@ -79,6 +86,13 @@ jobs:
7986
with:
8087
repository: godotengine/godot
8188
ref: 4.2-stable
89+
# TODO: remove once on godot 4.2.2 or newer!
90+
- name: Cherry pick macos fix
91+
run: |
92+
git fetch -a
93+
git config --global user.email "mario@super.com"
94+
git config --global user.name "Super Mario"
95+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
8296
- name: Clone Godot JVM module.
8397
uses: actions/checkout@v2
8498
with:
@@ -161,6 +175,13 @@ jobs:
161175
with:
162176
repository: godotengine/godot
163177
ref: 4.2-stable
178+
# TODO: remove once on godot 4.2.2 or newer!
179+
- name: Cherry pick macos fix
180+
run: |
181+
git fetch -a
182+
git config --global user.email "mario@super.com"
183+
git config --global user.name "Super Mario"
184+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
164185
- name: Clone Godot JVM module.
165186
uses: actions/checkout@v2
166187
with:

‎.github/workflows/check-pr-engine-editor-release.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
with:
4646
path: modules/kotlin_jvm
4747
submodules: recursive
48+
# TODO: remove once on godot 4.2.2 or newer!
49+
- name: Cherry pick macos fix
50+
run: |
51+
git fetch -a
52+
git config --global user.email "mario@super.com"
53+
git config --global user.name "Super Mario"
54+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
4855
- name: Setup Godot dependencies
4956
uses: ./.github/actions/godot-deps
5057
- name: Fix scons version

‎.github/workflows/check-pr-engine-export-template-debug.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ jobs:
6464
with:
6565
repository: godotengine/godot
6666
ref: 4.2-stable
67+
# TODO: remove once on godot 4.2.2 or newer!
68+
- name: Cherry pick macos fix
69+
run: |
70+
git fetch -a
71+
git config --global user.email "mario@super.com"
72+
git config --global user.name "Super Mario"
73+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
6774
- name: Clone Godot JVM module.
6875
uses: actions/checkout@v2
6976
with:

‎.github/workflows/check-pr-engine-export-template-release.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ jobs:
6868
with:
6969
path: modules/kotlin_jvm
7070
submodules: recursive
71+
# TODO: remove once on godot 4.2.2 or newer!
72+
- name: Cherry pick macos fix
73+
run: |
74+
git fetch -a
75+
git config --global user.email "mario@super.com"
76+
git config --global user.name "Super Mario"
77+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
7178
- name: Setup Godot dependencies
7279
uses: ./.github/actions/godot-deps
7380
- name: Fix scons version

‎.github/workflows/deploy-export-template.yaml

Lines changed: 69 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ jobs:
167167
repository: godotengine/godot
168168
ref: 4.2-stable
169169

170+
# TODO: remove once on godot 4.2.2 or newer!
171+
- name: Cherry pick macos fix
172+
run: |
173+
git fetch -a
174+
git config --global user.email "mario@super.com"
175+
git config --global user.name "Super Mario"
176+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
177+
170178
- name: Clone Godot JVM module.
171179
uses: actions/checkout@v2
172180
with:
@@ -240,23 +248,7 @@ jobs:
240248

241249
build-android-export-template:
242250
needs: [deploy-export-template]
243-
strategy:
244-
matrix:
245-
name: [ Android-debug, Android-release ]
246-
include:
247-
- name: Android-debug
248-
os: ubuntu-20.04
249-
java-version: 11
250-
target: template_debug
251-
base-path: platform/android/java/lib/libs/debug
252-
apk-name: android_debug.apk
253-
- name: Android-release
254-
os: ubuntu-20.04
255-
java-version: 11
256-
target: template_release
257-
base-path: platform/android/java/lib/libs/release
258-
apk-name: android_release.apk
259-
runs-on: ${{ matrix.os }}
251+
runs-on: ubuntu-20.04
260252
steps:
261253
- name: Download release informations
262254
uses: actions/download-artifact@v3
@@ -282,20 +274,71 @@ jobs:
282274
path: modules/kotlin_jvm
283275
submodules: recursive
284276

285-
- name: Build android export template
286-
uses: ./modules/kotlin_jvm/.github/actions/create-android-export-template
277+
- name: Setup Godot dependencies
278+
uses: ./.github/actions/godot-deps
279+
280+
- name: Set up JDK 17
281+
uses: actions/setup-java@v1
287282
with:
288-
target: ${{ matrix.target }}
289-
base-path: ${{ matrix.base-path }}
283+
java-version: 17
284+
285+
- name: Setup Android SDK
286+
uses: android-actions/setup-android@v2
287+
288+
- name: Download android template_debug export armv7 binary
289+
uses: actions/download-artifact@v3
290+
with:
291+
name: android-export-template_debug-binary-armv7
292+
path: platform/android/java/lib/libs/debug/armeabi-v7a
290293

291-
- name: Upload android export template ${{ matrix.target }}
294+
- name: Download android template_release export armv7 binary
295+
uses: actions/download-artifact@v3
296+
with:
297+
name: android-export-template_release-binary-armv7
298+
path: platform/android/java/lib/libs/release/armeabi-v7a
299+
300+
- name: Download android template_debug export arm64v8 binary
301+
uses: actions/download-artifact@v3
302+
with:
303+
name: android-export-template_debug-binary-arm64v8
304+
path: platform/android/java/lib/libs/debug/arm64-v8a
305+
306+
- name: Download android template_release export arm64v8 binary
307+
uses: actions/download-artifact@v3
308+
with:
309+
name: android-export-template_release-binary-arm64v8
310+
path: platform/android/java/lib/libs/release/arm64-v8a
311+
312+
- name: Download android template_debug export x86_64 binary
313+
uses: actions/download-artifact@v3
314+
with:
315+
name: android-export-template_debug-binary-x86_64
316+
path: platform/android/java/lib/libs/debug/x86_64
317+
318+
- name: Download android template_release export x86_64 binary
319+
uses: actions/download-artifact@v3
320+
with:
321+
name: android-export-template_release-binary-x86_64
322+
path: platform/android/java/lib/libs/release/x86_64
323+
324+
- name: Build android export templates
325+
shell: bash
326+
run: |
327+
cd platform/android/java/ && ./gradlew generateGodotTemplates
328+
329+
- name: Upload android export template debug
292330
uses: actions/upload-artifact@v3
293331
with:
294-
path: bin/${{ matrix.apk-name }}
295-
name: ${{ matrix.apk-name }}
332+
path: bin/android_debug.apk
333+
name: android_debug.apk
334+
335+
- name: Upload android export template release
336+
uses: actions/upload-artifact@v3
337+
with:
338+
path: bin/android_release.apk
339+
name: android_release.apk
296340

297341
- name: Upload android source
298-
if: matrix.target == 'template_release' #we only need to do this once doesn't matter for which target
299342
uses: actions/upload-artifact@v3
300343
with:
301344
path: bin/android_source.zip
@@ -575,7 +618,7 @@ jobs:
575618

576619
- name: Create version.txt
577620
run: |
578-
refVersion=4.1.2-stable #for easier search and replace with other `ref` occurrences
621+
refVersion=4.2-stable #for easier search and replace with other `ref` occurrences
579622
templatesVersion=${refVersion//-/.} #replace `-` with `.` in templates version
580623
echo "$templatesVersion" > templates/version.txt
581624
shell: bash

‎.github/workflows/deploy-godot-editor-release.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ jobs:
7676
repository: godotengine/godot
7777
ref: 4.2-stable
7878

79+
# TODO: remove once on godot 4.2.2 or newer!
80+
- name: Cherry pick macos fix
81+
run: |
82+
git fetch -a
83+
git config --global user.email "mario@super.com"
84+
git config --global user.name "Super Mario"
85+
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
86+
7987
- name: Setup Vulkan SDK
8088
if: matrix.platform == 'macos'
8189
run: misc/scripts/install_vulkan_sdk_macos.sh

0 commit comments

Comments
 (0)