forked from Schanbro/WeekFocus
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bfe36309c | ||
|
|
9ad23b2a3b | ||
|
|
658f6a9506 | ||
|
|
f9b666fe15 | ||
|
|
b1977d790d | ||
|
|
3d5cc10a1a | ||
|
|
52a758ff16 | ||
|
|
7dde81a715 |
No files matched your search
@@ -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,39 +32,74 @@ 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
|
||||||
run: |
|
run: |
|
||||||
LIC_DIR="${ANDROID_HOME:-$HOME/android-sdk}/licenses"
|
echo "${{ secrets.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: ./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" | 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"
|
||||||
|
|
||||||
|
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 in Gitea erstellen
|
- name: Release in Gitea erstellen
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## [1.0.1] - 2026-09-29
|
||||||
|
### Neu
|
||||||
|
- Erste stabile Version mit automatischen APK-Builds
|
||||||
|
- CHANGELOG.md als Release-Body
|
||||||
|
|
||||||
|
### Behoben
|
||||||
|
- VersionCode und -Name
|
||||||
+13
-2
@@ -3,6 +3,17 @@ plugins {
|
|||||||
alias(libs.plugins.kotlin.compose)
|
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 {
|
android {
|
||||||
namespace = "de.schanbro.weekfocus"
|
namespace = "de.schanbro.weekfocus"
|
||||||
compileSdk {
|
compileSdk {
|
||||||
@@ -13,8 +24,8 @@ android {
|
|||||||
applicationId = "de.schanbro.weekfocus"
|
applicationId = "de.schanbro.weekfocus"
|
||||||
minSdk = 29
|
minSdk = 29
|
||||||
targetSdk = 37
|
targetSdk = 37
|
||||||
versionCode = 1
|
versionCode = major * 10000 + minor * 100 + patch
|
||||||
versionName = "1.0"
|
versionName = tagVersion
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user