Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57f1c727be | ||
|
|
78d23f9cda | ||
|
|
1bfe36309c | ||
|
|
9ad23b2a3b | ||
|
|
658f6a9506 | ||
|
|
f9b666fe15 |
No files matched your search
@@ -9,8 +9,16 @@ on:
|
|||||||
jobs:
|
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
|
||||||
|
|
||||||
@@ -26,52 +34,37 @@ jobs:
|
|||||||
|
|
||||||
- name: Android SDK einrichten
|
- name: Android SDK einrichten
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SDK_PATH="$HOME/android-sdk"
|
SDK_PATH="$HOME/android-sdk"
|
||||||
SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager"
|
SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager"
|
||||||
|
|
||||||
if [ ! -x "$SDKMANAGER" ]; then
|
if [ ! -x "$SDKMANAGER" ]; then
|
||||||
echo "Installiere Android cmdline-tools..."
|
echo "Installiere Android cmdline-tools..."
|
||||||
|
|
||||||
mkdir -p "$SDK_PATH/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"
|
unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools"
|
||||||
mv "$SDK_PATH/cmdline-tools/cmdline-tools" \
|
mv "$SDK_PATH/cmdline-tools/cmdline-tools" "$SDK_PATH/cmdline-tools/latest"
|
||||||
"$SDK_PATH/cmdline-tools/latest"
|
|
||||||
|
|
||||||
rm /tmp/tools.zip
|
rm /tmp/tools.zip
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Akzeptiere Android-SDK-Lizenzen..."
|
# Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE)
|
||||||
"$SDKMANAGER" \
|
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
|
||||||
--sdk_root="$SDK_PATH" \
|
|
||||||
--licenses < <(yes) > /dev/null
|
|
||||||
|
|
||||||
echo "Installiere benötigte Android-SDK-Pakete..."
|
# Benötigte Pakete direkt installieren
|
||||||
"$SDKMANAGER" \
|
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
||||||
--sdk_root="$SDK_PATH" \
|
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-37.0" \
|
"platforms;android-37.0" \
|
||||||
"build-tools;36.0.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" > "$GITHUB_WORKSPACE/local.properties"
|
echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties"
|
||||||
|
|
||||||
- name: Keystore dekodieren
|
- name: Keystore dekodieren
|
||||||
|
env:
|
||||||
|
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
echo "$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
|
- name: Android Release APK bauen
|
||||||
run: |
|
run: |
|
||||||
@@ -79,46 +72,74 @@ jobs:
|
|||||||
|
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
VERSION="${GITHUB_REF_NAME#v}"
|
||||||
|
|
||||||
|
echo "Baue Version: $VERSION"
|
||||||
|
|
||||||
./gradlew assembleRelease \
|
./gradlew assembleRelease \
|
||||||
--no-daemon \
|
--no-daemon \
|
||||||
-PversionNameOverride="$VERSION"
|
-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
|
- name: Release-Notes aus CHANGELOG.md extrahieren
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
VERSION="${GITHUB_REF_NAME#v}"
|
||||||
|
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
|
||||||
|
|
||||||
awk -v v="$VERSION" '
|
if [ -f CHANGELOG.md ]; then
|
||||||
index($0, "## [" v "]") == 1 {
|
awk -v ver="$VERSION" '
|
||||||
found=1
|
/^##[[: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
|
next
|
||||||
}
|
}
|
||||||
|
found { print }
|
||||||
found && /^## \[/ {
|
' CHANGELOG.md > "$NOTES_FILE"
|
||||||
exit
|
else
|
||||||
}
|
: > "$NOTES_FILE"
|
||||||
|
|
||||||
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
|
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
|
- 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 }}
|
||||||
body_path: release-notes.md
|
body_path: ${{ runner.temp }}/release_notes.md
|
||||||
files: app/build/outputs/apk/release/*.apk
|
files: app/build/outputs/apk/release/WeekFocus-*.apk
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
+3
-6
@@ -1,9 +1,6 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [1.0.1] - 2026-09-29
|
## [1.1.0] - 2026-10-03
|
||||||
### Neu
|
|
||||||
- Erste stabile Version mit automatischen APK-Builds
|
|
||||||
- CHANGELOG.md als Release-Body
|
|
||||||
|
|
||||||
### Behoben
|
### New
|
||||||
- VersionCode und -Name
|
- chore: auto-generate apk files #6
|
||||||
@@ -30,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
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user