From 5ab73ff19a71c01cf4ffef8c818965d0ae928ad1 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Tue, 10 Dec 2024 20:21:13 +0000 Subject: [PATCH] Godot Editor 3.6 --- metadata/org.godotengine.editor.v3.yml | 103 +++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/metadata/org.godotengine.editor.v3.yml b/metadata/org.godotengine.editor.v3.yml index f0b68baad3..44c421162f 100644 --- a/metadata/org.godotengine.editor.v3.yml +++ b/metadata/org.godotengine.editor.v3.yml @@ -202,6 +202,7 @@ Builds: - versionName: 3.6.0.beta.0 versionCode: 306002000 + disable: beta commit: 7722461dc5a679379a1d13aec8747b7669ce81be timeout: 15000 sudo: @@ -225,6 +226,7 @@ Builds: - versionName: 3.6.0.beta.0 versionCode: 306002001 + disable: beta commit: 7722461dc5a679379a1d13aec8747b7669ce81be timeout: 15000 sudo: @@ -248,6 +250,7 @@ Builds: - versionName: 3.6.0.beta.0 versionCode: 306002002 + disable: beta commit: 7722461dc5a679379a1d13aec8747b7669ce81be timeout: 15000 sudo: @@ -271,6 +274,7 @@ Builds: - versionName: 3.6.0.beta.0 versionCode: 306002003 + disable: beta commit: 7722461dc5a679379a1d13aec8747b7669ce81be timeout: 15000 sudo: @@ -292,10 +296,99 @@ Builds: KnownVuln: en-US: Vulnerability in showing WebP images (CVE-2023-4863) -MaintainerNotes: |- - 3.5.x is the last stable release. Starting from 3.6.x many changes from 4.0 branch - are backported, versionCode is also different. + - versionName: 3.6.0.stable + versionCode: 306005000 + commit: de2f0f147c5b7eff2d0f6dbc35042a4173fd59be + timeout: 15000 + sudo: + - apt-get update + - apt-get install -y pkg-config scons + output: platform/android/java/editor/build/outputs/apk/release/android_editor-release-unsigned.apk + prebuild: + - mkdir -p /opt/android-sdk/cmdline-tools/latest/bin + - ln -sf $(which sdkmanager) /opt/android-sdk/cmdline-tools/latest/bin/ + - cd platform/android/java + - sed -i 's/url repoUrl//' app/build.gradle + - sed -i 's/editorBuildNumber\ =\ 0/editorBuildNumber\ =\ 0/' editor/build.gradle + - sed -i 's/versionCode\ generateVersionCode()/versionCode $$VERCODE$$/' editor/build.gradle + build: + - export ANDROID_SDK_ROOT="$$SDK$$" + - scons -j$(nproc) verbose=yes warnings=no progress=no platform=android android_arch=x86 + production=yes tools=yes target=release_debug store_release=yes + - cd platform/android/java + - gradle generateGodotEditor + ndk: 23.2.8568313 + - versionName: 3.6.0.stable + versionCode: 306005001 + commit: de2f0f147c5b7eff2d0f6dbc35042a4173fd59be + timeout: 15000 + sudo: + - apt-get update + - apt-get install -y pkg-config scons + output: platform/android/java/editor/build/outputs/apk/release/android_editor-release-unsigned.apk + prebuild: + - mkdir -p /opt/android-sdk/cmdline-tools/latest/bin + - ln -sf $(which sdkmanager) /opt/android-sdk/cmdline-tools/latest/bin/ + - cd platform/android/java + - sed -i 's/url repoUrl//' app/build.gradle + - sed -i 's/editorBuildNumber\ =\ 0/editorBuildNumber\ =\ 0/' editor/build.gradle + - sed -i 's/versionCode\ generateVersionCode()/versionCode $$VERCODE$$/' editor/build.gradle + build: + - export ANDROID_SDK_ROOT="$$SDK$$" + - scons -j$(nproc) verbose=yes warnings=no progress=no platform=android android_arch=x86_64 + production=yes tools=yes target=release_debug store_release=yes + - cd platform/android/java + - gradle generateGodotEditor + ndk: 23.2.8568313 + + - versionName: 3.6.0.stable + versionCode: 306005002 + commit: de2f0f147c5b7eff2d0f6dbc35042a4173fd59be + timeout: 15000 + sudo: + - apt-get update + - apt-get install -y pkg-config scons + output: platform/android/java/editor/build/outputs/apk/release/android_editor-release-unsigned.apk + prebuild: + - mkdir -p /opt/android-sdk/cmdline-tools/latest/bin + - ln -sf $(which sdkmanager) /opt/android-sdk/cmdline-tools/latest/bin/ + - cd platform/android/java + - sed -i 's/url repoUrl//' app/build.gradle + - sed -i 's/editorBuildNumber\ =\ 0/editorBuildNumber\ =\ 0/' editor/build.gradle + - sed -i 's/versionCode\ generateVersionCode()/versionCode $$VERCODE$$/' editor/build.gradle + build: + - export ANDROID_SDK_ROOT="$$SDK$$" + - scons -j$(nproc) verbose=yes warnings=no progress=no platform=android android_arch=armv7 + production=yes tools=yes target=release_debug store_release=yes + - cd platform/android/java + - gradle generateGodotEditor + ndk: 23.2.8568313 + + - versionName: 3.6.0.stable + versionCode: 306005003 + commit: de2f0f147c5b7eff2d0f6dbc35042a4173fd59be + timeout: 15000 + sudo: + - apt-get update + - apt-get install -y pkg-config scons + output: platform/android/java/editor/build/outputs/apk/release/android_editor-release-unsigned.apk + prebuild: + - mkdir -p /opt/android-sdk/cmdline-tools/latest/bin + - ln -sf $(which sdkmanager) /opt/android-sdk/cmdline-tools/latest/bin/ + - cd platform/android/java + - sed -i 's/url repoUrl//' app/build.gradle + - sed -i 's/editorBuildNumber\ =\ 0/editorBuildNumber\ =\ 0/' editor/build.gradle + - sed -i 's/versionCode\ generateVersionCode()/versionCode $$VERCODE$$/' editor/build.gradle + build: + - export ANDROID_SDK_ROOT="$$SDK$$" + - scons -j$(nproc) verbose=yes warnings=no progress=no platform=android android_arch=arm64v8 + production=yes tools=yes target=release_debug store_release=yes + - cd platform/android/java + - gradle generateGodotEditor + ndk: 23.2.8568313 + +MaintainerNotes: |- VersionCode is generated at compile time upstream. F-Droid builds correspond to upstream version codes with an addition of a single digit at the end to differentiate builds for different architecture: @@ -325,5 +418,5 @@ MaintainerNotes: |- ArchivePolicy: 12 AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 3.5.3.stable -CurrentVersionCode: 305033 +CurrentVersion: 3.6.0.stable +CurrentVersionCode: 306005003