diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index d083410..f931db1 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -9,8 +9,16 @@ on: jobs: build: runs-on: ubuntu-latest - steps: + - name: Secrets prüfen + run: | + [ -n "$KEYSTORE_PASSWORD" ] && echo "KEYSTORE_PASSWORD gesetzt" || echo "KEYSTORE_PASSWORD LEER" + [ -n "$KEY_ALIAS" ] && echo "KEY_ALIAS gesetzt" || echo "KEY_ALIAS LEER" + [ -n "$KEY_PASSWORD" ] && echo "KEY_PASSWORD gesetzt" || echo "KEY_PASSWORD LEER" + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - name: Code auschecken uses: actions/checkout@v4 @@ -26,119 +34,46 @@ jobs: - name: Android SDK einrichten run: | - set -euo pipefail - 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" - - curl -sSL \ - -o /tmp/tools.zip \ - https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.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" - + mv "$SDK_PATH/cmdline-tools/cmdline-tools" "$SDK_PATH/cmdline-tools/latest" rm /tmp/tools.zip fi - echo "Akzeptiere Android-SDK-Lizenzen..." - "$SDKMANAGER" \ - --sdk_root="$SDK_PATH" \ - --licenses < <(yes) > /dev/null + # Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE) + "$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null - echo "Installiere benötigte Android-SDK-Pakete..." - "$SDKMANAGER" \ - --sdk_root="$SDK_PATH" \ + # 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 "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV + echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties" - name: Keystore dekodieren run: | - set -euo pipefail - - echo "${{ secrets.KEYSTORE_BASE64 }}" \ - | base64 -d > "$RUNNER_TEMP/release.keystore" - - echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> "$GITHUB_ENV" + echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > "$RUNNER_TEMP/release.keystore" + echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV - name: Android Release APK bauen - run: | - set -euo pipefail - - VERSION="${GITHUB_REF_NAME#v}" - APK_DIR="app/build/outputs/apk/release" - APK_NAME="WeekFocus-${VERSION}.apk" - - ./gradlew assembleRelease \ - --no-daemon \ - -PversionNameOverride="$VERSION" - - mv "$APK_DIR/app-release.apk" "$APK_DIR/$APK_NAME" - - echo "APK erstellt: $APK_DIR/$APK_NAME" - ls -lh "$APK_DIR" + run: ./gradlew assembleRelease --no-daemon env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - env: - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - - - name: Release-Notes extrahieren - run: | - set -euo pipefail - - VERSION="${GITHUB_REF_NAME#v}" - - awk -v v="$VERSION" ' - index($0, "## [" v "]") == 1 { - found=1 - next - } - - found && /^## \[/ { - exit - } - - found { - print - } - ' CHANGELOG.md > release-notes.md - - if [ ! -s release-notes.md ]; then - echo "Keine Release-Notes für Version $VERSION vorhanden." \ - > release-notes.md - fi - - name: Release in Gitea erstellen uses: softprops/action-gh-release@v2 with: - tag_name: ${{ github.ref_name }} - name: ${{ github.ref_name }} - body_path: release-notes.md - files: app/build/outputs/apk/release/WeekFocus-*.apk + files: app/build/outputs/apk/release/*.apk env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: APK-Version prüfen - run: | - VERSION="${GITHUB_REF_NAME#v}" - - "$ANDROID_HOME/build-tools/36.0.0/aapt" dump badging \ - "app/build/outputs/apk/release/WeekFocus-${VERSION}.apk" \ - | grep -E "versionCode|versionName" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file