From 46ab28f76f4b73f1ff855a5fe9c6895e813d21e0 Mon Sep 17 00:00:00 2001
From: Vaillant Jeremy <jeremy.vaillant@ubby.ai>
Date: Sun, 17 May 2026 20:35:58 +0200
Subject: [PATCH] fix(android): enable ETC2/ASTC import + use versioned editor
 settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two fixes that finally land the Android export. Verified locally
with godot 4.6.2-arch + downloaded 4.6 templates + Android SDK.

- project.godot: add
  rendering/textures/vram_compression/import_etc2_astc=true.
  Without it Godot refuses the Android export with "La plateforme
  cible nécessite une compression de texture « ETC2/ASTC »". In
  headless mode this surfaces as an *empty* configuration-errors
  block, which is what kept us stuck in CI.

- workflow: write Godot editor settings to
  editor_settings-${GODOT_VERSION}.tres (i.e. -4.6.tres on 4.6),
  not -4.tres. Godot 4.5+ uses a minor-version-suffixed settings
  file; the major-only name is ignored by 4.6, so our injected
  android_sdk_path / java_sdk_path / debug_keystore never reached
  the export plugin.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .gitea/workflows/build.yml | 4 +++-
 project.godot              | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index ff26ec2..4a65d0b 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -167,7 +167,9 @@ jobs:
       - name: Write Godot editor settings (Android SDK / JDK paths)
         run: |
           mkdir -p ~/.config/godot
-          cat > ~/.config/godot/editor_settings-4.tres <<EOF
+          # Godot 4.5+ uses a minor-version-suffixed settings file
+          # (editor_settings-4.6.tres for 4.6), not the major-only -4.tres.
+          cat > ~/.config/godot/editor_settings-${GODOT_VERSION}.tres <<EOF
           [gd_resource type="EditorSettings" format=3]
           [resource]
           export/android/android_sdk_path = "${ANDROID_HOME}"
diff --git a/project.godot b/project.godot
index 2947eda..27a08cc 100644
--- a/project.godot
+++ b/project.godot
@@ -67,4 +67,5 @@ locale/translations=PackedStringArray("res://locales/fr.po", "res://locales/en.p
 
 [rendering]
 
+textures/vram_compression/import_etc2_astc=true
 environment/defaults/default_environment="res://default_env.tres"