Compare commits

...
6 Commits
Author SHA1 Message Date
robin 78d23f9cda fix 2026-10-03 12:39:37 +02:00
robin 1bfe36309c fix 2026-09-29 20:39:36 +02:00
robin 9ad23b2a3b fix 2026-09-29 20:30:18 +02:00
robin 658f6a9506 fix 2026-09-29 20:17:41 +02:00
robin f9b666fe15 chore: fix for 1.0.3 2026-09-29 20:10:43 +02:00
robin b1977d790d chore: fix for v1.0.2 2026-09-29 19:53:01 +02:00
2 changed files with 77 additions and 43 deletions

No files matched your search

+64 -35
View File
@@ -10,6 +10,15 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: 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 - name: Code auschecken
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -23,62 +32,82 @@ jobs:
- name: Rechte für gradlew setzen - name: Rechte für gradlew setzen
run: chmod +x gradlew run: chmod +x gradlew
- name: Android SDK Pfad prüfen & einrichten - name: Android SDK einrichten
run: | run: |
if [ -d "/usr/local/lib/android/sdk" ]; then SDK_PATH="$HOME/android-sdk"
SDK_PATH="/usr/local/lib/android/sdk" SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager"
elif [ -d "/opt/android-sdk" ]; then
SDK_PATH="/opt/android-sdk" if [ ! -x "$SDKMANAGER" ]; then
else echo "Installiere Android cmdline-tools..."
echo "Android SDK nicht gefunden. Installiere cmdline-tools..."
SDK_PATH="$HOME/android-sdk"
mkdir -p "$SDK_PATH/cmdline-tools" mkdir -p "$SDK_PATH/cmdline-tools"
cd "$SDK_PATH/cmdline-tools" curl -sSL -o /tmp/tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
curl -s -o tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools"
unzip -q tools.zip mv "$SDK_PATH/cmdline-tools/cmdline-tools" "$SDK_PATH/cmdline-tools/latest"
mv cmdline-tools latest rm /tmp/tools.zip
rm tools.zip
fi 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_HOME=$SDK_PATH" >> $GITHUB_ENV
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
echo "sdk.dir=$SDK_PATH" > local.properties echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties"
- name: Android SDK Lizenzen vorab akzeptieren - name: Keystore dekodieren
env:
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
run: | run: |
LIC_DIR="${ANDROID_HOME:-$HOME/android-sdk}/licenses" echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
mkdir -p "$LIC_DIR" echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
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"
- name: Android Release APK bauen - name: Android Release APK bauen
run: | run: |
set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}" VERSION="${GITHUB_REF_NAME#v}"
./gradlew assembleRelease --no-daemon -PversionNameOverride="$VERSION"
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: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
- name: Release-Notes extrahieren
run: |
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
[ -s release-notes.md ] || echo "Keine Release-Notes vorhanden." > release-notes.md
- name: Release in Gitea erstellen - name: Release in Gitea erstellen
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2
with: with:
tag_name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }} name: ${{ github.ref_name }}
files: app/build/outputs/apk/release/*.apk files: app/build/outputs/apk/release/WeekFocus-*.apk
body_path: release-notes.md
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+13 -8
View File
@@ -14,11 +14,6 @@ val major = parts.getOrElse(0) { 0 }
val minor = parts.getOrElse(1) { 0 } val minor = parts.getOrElse(1) { 0 }
val patch = parts.getOrElse(2) { 0 } val patch = parts.getOrElse(2) { 0 }
val copyChangelog by tasks.registering(Copy::class) {
from(rootProject.file("CHANGELOG.md"))
into(layout.buildDirectory.dir("generated/changelog"))
}
android { android {
namespace = "de.schanbro.weekfocus" namespace = "de.schanbro.weekfocus"
compileSdk { compileSdk {
@@ -35,8 +30,21 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
signingConfigs {
create("release") {
val ksPath = System.getenv("KEYSTORE_PATH")
if (ksPath != null) {
storeFile = file(ksPath)
storePassword = System.getenv("KEYSTORE_PASSWORD")
keyAlias = System.getenv("KEY_ALIAS")
keyPassword = System.getenv("KEY_PASSWORD")
}
}
}
buildTypes { buildTypes {
release { release {
signingConfig = signingConfigs.getByName("release")
optimization { optimization {
enable = false enable = false
} }
@@ -68,6 +76,3 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.test.manifest)
debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.tooling)
} }
tasks.matching { it.name.startsWith("merge") && it.name.endsWith("Assets") }
.configureEach { dependsOn(copyChangelog) }