diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index f931db1..e5a2406 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -60,20 +60,86 @@ jobs: echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties" - name: Keystore dekodieren + env: + KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} run: | - echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > "$RUNNER_TEMP/release.keystore" + echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore" echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV - name: Android Release APK bauen - run: ./gradlew assembleRelease --no-daemon + run: | + set -euo pipefail + + VERSION="${GITHUB_REF_NAME#v}" + + echo "Baue Version: $VERSION" + + ./gradlew assembleRelease \ + --no-daemon \ + -PversionNameOverride="$VERSION" + + echo "Erzeugte APK-Dateien:" + find app/build/outputs -type f -name "*.apk" -print + + APK_SOURCE="$(find app/build/outputs/apk/release -maxdepth 1 -type f -name "*.apk" ! -name "*unsigned*" | head -n 1)" + + if [ -z "$APK_SOURCE" ]; then + echo "Keine Release-APK gefunden." + exit 1 + fi + + APK_DIR="app/build/outputs/apk/release" + APK_NAME="WeekFocus-${VERSION}.apk" + APK_TARGET="$APK_DIR/$APK_NAME" + + mv "$APK_SOURCE" "$APK_TARGET" + + "$ANDROID_HOME/build-tools/36.0.0/apksigner" verify --verbose "$APK_TARGET" + + echo "APK erstellt: $APK_TARGET" + ls -lh "$APK_DIR" env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + - name: Release-Notes aus CHANGELOG.md extrahieren + run: | + VERSION="${GITHUB_REF_NAME#v}" + NOTES_FILE="$RUNNER_TEMP/release_notes.md" + + if [ -f CHANGELOG.md ]; then + awk -v ver="$VERSION" ' + /^##[[:space:]]/ { + if (found) exit + line = $0 + sub(/^##[[:space:]]+/, "", line) + sub(/^\[?v?/, "", line) + if (substr(line, 1, length(ver)) == ver) { + rest = substr(line, length(ver) + 1) + if (rest ~ /^([^0-9.]|$)/) { found = 1 } + } + next + } + found { print } + ' CHANGELOG.md > "$NOTES_FILE" + else + : > "$NOTES_FILE" + fi + + if ! grep -q '[^[:space:]]' "$NOTES_FILE"; then + echo "Keine Release-Notes für Version $VERSION vorhanden." > "$NOTES_FILE" + fi + + echo "Release-Notes:" + cat "$NOTES_FILE" + - name: Release in Gitea erstellen uses: softprops/action-gh-release@v2 with: - files: app/build/outputs/apk/release/*.apk + tag_name: ${{ github.ref_name }} + name: ${{ github.ref_name }} + body_path: ${{ runner.temp }}/release_notes.md + files: app/build/outputs/apk/release/WeekFocus-*.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..ee27eff --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changelog + +## [1.1.0] - 2026-10-03 + +### New +- chore: auto-generate apk files #6 \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 89b1fe0..365304d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,17 @@ plugins { alias(libs.plugins.kotlin.compose) } +val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev" + +// "1.2.3" oder "1.2.3-alpha9" -> Kern "1.2.3" für den versionCode +val core = tagVersion + .removePrefix("v") + .substringBefore("-") +val parts = core.split(".").map { it.toIntOrNull() ?: 0 } +val major = parts.getOrElse(0) { 0 } +val minor = parts.getOrElse(1) { 0 } +val patch = parts.getOrElse(2) { 0 } + android { namespace = "de.schanbro.weekfocus" compileSdk { @@ -13,8 +24,8 @@ android { applicationId = "de.schanbro.weekfocus" minSdk = 29 targetSdk = 37 - versionCode = 1 - versionName = "1.0" + versionCode = major * 10000 + minor * 100 + patch + versionName = tagVersion testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }