Fix Godot editor settings and Java path (#154)
This commit is contained in:
2
.github/workflows/godot-ci.yml
vendored
2
.github/workflows/godot-ci.yml
vendored
@@ -20,6 +20,8 @@ jobs:
|
|||||||
- name: Setup
|
- name: Setup
|
||||||
run: |
|
run: |
|
||||||
mkdir -v -p ~/.local/share/godot/export_templates/
|
mkdir -v -p ~/.local/share/godot/export_templates/
|
||||||
|
mkdir -v -p ~/.config/
|
||||||
|
mv /root/.config/godot ~/.config/godot
|
||||||
mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
|
mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
|
||||||
- name: Windows Build
|
- name: Windows Build
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -68,6 +68,9 @@ RUN keytool -keyalg RSA -genkeypair -alias androiddebugkey -keypass android -key
|
|||||||
RUN godot -v -e --quit --headless ${GODOT_TEST_ARGS}
|
RUN godot -v -e --quit --headless ${GODOT_TEST_ARGS}
|
||||||
# Godot editor settings are stored per minor version since 4.3.
|
# Godot editor settings are stored per minor version since 4.3.
|
||||||
# `${GODOT_VERSION:0:3}` transforms a string of the form `x.y.z` into `x.y`, even if it's already `x.y` (until Godot 4.9).
|
# `${GODOT_VERSION:0:3}` transforms a string of the form `x.y.z` into `x.y`, even if it's already `x.y` (until Godot 4.9).
|
||||||
|
RUN echo '[gd_resource type="EditorSettings" format=3]' > ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
|
RUN echo '[resource]' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
|
RUN echo 'export/android/java_sdk_path = "/usr/lib/jvm/java-17-openjdk-amd64"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
RUN echo 'export/android/android_sdk_path = "/usr/lib/android-sdk"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
RUN echo 'export/android/android_sdk_path = "/usr/lib/android-sdk"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
RUN echo 'export/android/debug_keystore = "/root/debug.keystore"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
RUN echo 'export/android/debug_keystore = "/root/debug.keystore"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
RUN echo 'export/android/debug_keystore_user = "androiddebugkey"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
RUN echo 'export/android/debug_keystore_user = "androiddebugkey"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
|
|||||||
@@ -75,6 +75,9 @@ RUN keytool -keyalg RSA -genkeypair -alias androiddebugkey -keypass android -key
|
|||||||
RUN godot -v -e --quit --headless ${GODOT_TEST_ARGS}
|
RUN godot -v -e --quit --headless ${GODOT_TEST_ARGS}
|
||||||
# Godot editor settings are stored per minor version since 4.3.
|
# Godot editor settings are stored per minor version since 4.3.
|
||||||
# `${GODOT_VERSION:0:3}` transforms a string of the form `x.y.z` into `x.y`, even if it's already `x.y` (until Godot 4.9).
|
# `${GODOT_VERSION:0:3}` transforms a string of the form `x.y.z` into `x.y`, even if it's already `x.y` (until Godot 4.9).
|
||||||
|
RUN echo '[gd_resource type="EditorSettings" format=3]' > ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
|
RUN echo '[resource]' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
|
RUN echo 'export/android/java_sdk_path = "/usr/lib/jvm/java-17-openjdk-amd64"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
RUN echo 'export/android/android_sdk_path = "/usr/lib/android-sdk"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
RUN echo 'export/android/android_sdk_path = "/usr/lib/android-sdk"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
RUN echo 'export/android/debug_keystore = "/root/debug.keystore"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
RUN echo 'export/android/debug_keystore = "/root/debug.keystore"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
RUN echo 'export/android/debug_keystore_user = "androiddebugkey"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
RUN echo 'export/android/debug_keystore_user = "androiddebugkey"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
|
||||||
|
|||||||
Reference in New Issue
Block a user