diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 4d2a72d..9f4dbb4 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -25,12 +25,6 @@ jobs: ssh-key: ${{ secrets.TEKTON_SSH_KEY }} ssh-strict: false - - name: Checkout repository - uses: actions/checkout@v4 - with: - ssh-key: ${{ secrets.TEKTON_SSH_KEY }} - ssh-strict: false - - name: Setup Godot run: | wget -q https://github.com/godotengine/godot-builds/releases/download/4.6-stable/Godot_v4.6-stable_linux.x86_64.zip @@ -43,7 +37,12 @@ jobs: set -euo pipefail mkdir -v -p ~/.local/share/godot/export_templates/4.6.stable wget -nv https://github.com/godotengine/godot-builds/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O /tmp/godot-templates.tpz - unzip -o -q /tmp/godot-templates.tpz -d ~/.local/share/godot/export_templates/4.6.stable + unzip -o -q /tmp/godot-templates.tpz -d /tmp/godot-templates + if [ -d /tmp/godot-templates/templates ]; then + mv /tmp/godot-templates/templates/* ~/.local/share/godot/export_templates/4.6.stable/ + else + cp -a /tmp/godot-templates/* ~/.local/share/godot/export_templates/4.6.stable/ 2>/dev/null || true + fi ls -la ~/.local/share/godot/export_templates/4.6.stable || true - name: Export Windows @@ -85,7 +84,12 @@ jobs: set -euo pipefail mkdir -v -p ~/.local/share/godot/export_templates/4.6.stable wget -nv https://github.com/godotengine/godot-builds/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O /tmp/godot-templates.tpz - unzip -o -q /tmp/godot-templates.tpz -d ~/.local/share/godot/export_templates/4.6.stable + unzip -o -q /tmp/godot-templates.tpz -d /tmp/godot-templates + if [ -d /tmp/godot-templates/templates ]; then + mv /tmp/godot-templates/templates/* ~/.local/share/godot/export_templates/4.6.stable/ + else + cp -a /tmp/godot-templates/* ~/.local/share/godot/export_templates/4.6.stable/ 2>/dev/null || true + fi ls -la ~/.local/share/godot/export_templates/4.6.stable || true - name: Export Linux @@ -127,15 +131,28 @@ jobs: set -euo pipefail mkdir -v -p ~/.local/share/godot/export_templates/4.6.stable wget -nv https://github.com/godotengine/godot-builds/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O /tmp/godot-templates.tpz - unzip -o -q /tmp/godot-templates.tpz -d ~/.local/share/godot/export_templates/4.6.stable + unzip -o -q /tmp/godot-templates.tpz -d /tmp/godot-templates + if [ -d /tmp/godot-templates/templates ]; then + mv /tmp/godot-templates/templates/* ~/.local/share/godot/export_templates/4.6.stable/ + else + cp -a /tmp/godot-templates/* ~/.local/share/godot/export_templates/4.6.stable/ 2>/dev/null || true + fi ls -la ~/.local/share/godot/export_templates/4.6.stable || true - name: Setup Android SDK - uses: android-actions/setup-android@v3 - with: - api-level: 34 - ndk-version: r26c - cmdline-tools-version: '11.0' + run: | + set -euo pipefail + ANDROID_HOME=/root/Android/Sdk + mkdir -p "$ANDROID_HOME" + cd "$ANDROID_HOME" + wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O cmdline-tools.zip + unzip -q cmdline-tools.zip + mkdir -p cmdline-tools/latest + mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || true + export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" + echo "$ANDROID_HOME/cmdline-tools/latest/bin" >> "$GITHUB_PATH" + echo "$ANDROID_HOME/platform-tools" >> "$GITHUB_PATH" + yes | sdkmanager --sdk_root="$ANDROID_HOME" "platform-tools" "platforms;android-34" "build-tools;34.0.0" "ndk;26.1.10909118" - name: Export Android run: |