Compare commits

..
1 Commits
Author SHA1 Message Date
robin b1977d790d chore: fix for v1.0.2 2026-09-29 19:53:01 +02:00
2 changed files with 69 additions and 37 deletions

No files matched your search

+69 -29
View File
@@ -9,6 +9,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Code auschecken - name: Code auschecken
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -23,41 +24,64 @@ 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 set -euo pipefail
SDK_PATH="/usr/local/lib/android/sdk"
elif [ -d "/opt/android-sdk" ]; then
SDK_PATH="/opt/android-sdk"
else
echo "Android SDK nicht gefunden. Installiere cmdline-tools..."
SDK_PATH="$HOME/android-sdk" 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" mkdir -p "$SDK_PATH/cmdline-tools"
cd "$SDK_PATH/cmdline-tools"
curl -s -o tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip curl -sSL \
unzip -q tools.zip -o /tmp/tools.zip \
mv cmdline-tools latest https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
rm tools.zip
unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools"
mv "$SDK_PATH/cmdline-tools/cmdline-tools" \
"$SDK_PATH/cmdline-tools/latest"
rm /tmp/tools.zip
fi fi
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV echo "Akzeptiere Android-SDK-Lizenzen..."
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV "$SDKMANAGER" \
echo "sdk.dir=$SDK_PATH" > local.properties --sdk_root="$SDK_PATH" \
--licenses < <(yes) > /dev/null
- name: Android SDK Lizenzen vorab akzeptieren echo "Installiere benötigte Android-SDK-Pakete..."
"$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 "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties"
- name: Keystore dekodieren
run: | run: |
LIC_DIR="${ANDROID_HOME:-$HOME/android-sdk}/licenses" set -euo pipefail
mkdir -p "$LIC_DIR"
echo -e "\n24333f8a637b37ea6d1270c750f0160576065016" > "$LIC_DIR/android-sdk-license" echo "${{ secrets.KEYSTORE_BASE64 }}" \
echo -e "\n84831b9409646a456e88576d19212d3582701724" >> "$LIC_DIR/android-sdk-license" | base64 -d > "$RUNNER_TEMP/release.keystore"
echo -e "\nd975f751698a7780098d5c6814341db27684b376" > "$LIC_DIR/android-sdk-preview-license"
echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5e40007e" > "$LIC_DIR/android-googletv-license" echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> "$GITHUB_ENV"
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"
./gradlew assembleRelease \
--no-daemon \
-PversionNameOverride="$VERSION"
env: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -65,20 +89,36 @@ jobs:
- name: Release-Notes extrahieren - name: Release-Notes extrahieren
run: | run: |
set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}" VERSION="${GITHUB_REF_NAME#v}"
awk -v v="$VERSION" ' awk -v v="$VERSION" '
index($0, "## [" v "]") == 1 {found=1; next} index($0, "## [" v "]") == 1 {
found && /^## \[/ {exit} found=1
found {print} next
}
found && /^## \[/ {
exit
}
found {
print
}
' CHANGELOG.md > release-notes.md ' CHANGELOG.md > release-notes.md
[ -s release-notes.md ] || echo "Keine Release-Notes vorhanden." > 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 - 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
body_path: release-notes.md body_path: release-notes.md
files: app/build/outputs/apk/release/*.apk
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-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 {
@@ -68,6 +63,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) }