From 261b2c332ff4ab3770208d4176e537e0b5d9390b Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 29 Sep 2026 17:01:40 +0200 Subject: [PATCH] fix workflow 17 --- .gitea/workflows/release.yaml | 44 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 31ed339..672e56c 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -23,36 +23,32 @@ jobs: - name: Rechte für gradlew setzen run: chmod +x gradlew - - name: Android SDK Pfad prüfen & einrichten + - name: Android SDK einrichten run: | - if [ -d "/usr/local/lib/android/sdk" ]; then - SDK_PATH="/usr/local/lib/android/sdk" - elif [ -d "/opt/android-sdk" ]; then - SDK_PATH="/opt/android-sdk" - else - echo "Android SDK nicht gefunden. Installiere cmdline-tools..." - SDK_PATH="$HOME/android-sdk" + SDK_PATH="$HOME/android-sdk" + SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager" + + if [ ! -x "$SDKMANAGER" ]; then + echo "Installiere Android cmdline-tools..." mkdir -p "$SDK_PATH/cmdline-tools" - cd "$SDK_PATH/cmdline-tools" - curl -s -o tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip - unzip -q tools.zip - mv cmdline-tools latest - rm tools.zip + curl -sSL -o /tmp/tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip + unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools" + mv "$SDK_PATH/cmdline-tools/cmdline-tools" "$SDK_PATH/cmdline-tools/latest" + rm /tmp/tools.zip fi + # Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE) + "$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null + + # Benötigte Pakete direkt installieren + "$SDKMANAGER" --sdk_root="$SDK_PATH" \ + "platform-tools" \ + "platforms;android-37.0" \ + "build-tools;36.0.0" + echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV - echo "sdk.dir=$SDK_PATH" > local.properties - - - name: Android SDK Lizenzen vorab akzeptieren - run: | - LIC_DIR="${ANDROID_HOME:-$HOME/android-sdk}/licenses" - mkdir -p "$LIC_DIR" - echo -e "\n24333f8a637b37ea6d1270c750f0160576065016" > "$LIC_DIR/android-sdk-license" - echo -e "\n84831b9409646a456e88576d19212d3582701724" >> "$LIC_DIR/android-sdk-license" - echo -e "\nd975f751698a7780098d5c6814341db27684b376" > "$LIC_DIR/android-sdk-preview-license" - echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5e40007e" > "$LIC_DIR/android-googletv-license" - echo -e "\n6010077ebe6b4f930974d1266684e201b8723913" > "$LIC_DIR/android-googlexr-license" + echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties" - name: Android Release APK bauen run: ./gradlew assembleRelease --no-daemon