diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index b5da0a2..855975b 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -55,21 +55,28 @@ jobs: - name: Installera JDK 17 + Android SDK (arm64) run: | set -e + echo "== apt: JDK 17 + verktyg ==" sudo apt-get update -qq sudo apt-get install -y -qq openjdk-17-jdk-headless wget unzip jq curl export ANDROID_HOME=$HOME/android-sdk mkdir -p "$ANDROID_HOME/cmdline-tools" - wget -q "$CMDLINE_TOOLS_URL" -O /tmp/cmdline-tools.zip + echo "== hämtar cmdline-tools ==" + wget -nv "$CMDLINE_TOOLS_URL" -O /tmp/cmdline-tools.zip unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools" mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest" - yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null + echo "== accepterar licenser ==" + # (yes || true): yes dör med SIGPIPE när sdkmanager stänger röret, + # och jobbet kör med pipefail — utan skyddet faller steget på exit 141. + (yes || true) | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null + echo "== installerar platform-35 + build-tools ==" "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-35" "build-tools;34.0.0" > /dev/null - # arm64-byggd aapt2 (Googles är x86_64-only) + echo "== hämtar arm64-aapt2 (Googles är x86_64-only) ==" mkdir -p "$HOME/ci-tools" - wget -q "$AAPT2_ARM64_URL" -O /tmp/sdk-tools-arm64.zip + wget -nv "$AAPT2_ARM64_URL" -O /tmp/sdk-tools-arm64.zip unzip -qo /tmp/sdk-tools-arm64.zip -d "$HOME/ci-tools" chmod +x "$HOME/ci-tools/build-tools/aapt2" echo "ANDROID_HOME=$ANDROID_HOME" >> "$GITHUB_ENV" + echo "== SDK-setup klar ==" - name: Bygg signerad release-APK run: |