From 73c53e554d5f2c9bb8942a9c6279dbb3c0c3ec51 Mon Sep 17 00:00:00 2001 From: claude Date: Thu, 23 Jul 2026 13:16:00 +0200 Subject: [PATCH] =?UTF-8?q?CI:=20pipefail-s=C3=A4kra=20licenssteget=20och?= =?UTF-8?q?=20g=C3=B6r=20SDK-setup=20pratigare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit yes | sdkmanager --licenses föll alltid med exit 141 (SIGPIPE) eftersom jobbet kör med pipefail. Progress-markörer så att framtida fel pekar på rätt delsteg. Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01Kf4MAbZ3c3B4Xy5XfuGsCP --- .gitea/workflows/release.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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: |