Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ad23b2a3b | ||
|
|
658f6a9506 | ||
|
|
f9b666fe15 | ||
|
|
b1977d790d | ||
|
|
3d5cc10a1a |
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,62 +32,71 @@ 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: |
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
VERSION="${GITHUB_REF_NAME#v}"
|
||||||
./gradlew assembleRelease --no-daemon -PversionNameOverride="$VERSION"
|
|
||||||
|
if [ -z "$VERSION" ] || [ "$VERSION" = "$GITHUB_REF_NAME" ]; then
|
||||||
|
echo "Ungültiger Git-Tag: '$GITHUB_REF_NAME'"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Baue Version: $VERSION"
|
||||||
|
|
||||||
|
./gradlew assembleRelease \
|
||||||
|
--no-daemon \
|
||||||
|
-PversionNameOverride="$VERSION"
|
||||||
|
|
||||||
|
APK_DIR="app/build/outputs/apk/release"
|
||||||
|
APK_NAME="WeekFocus-${VERSION}.apk"
|
||||||
|
|
||||||
|
mv "$APK_DIR/app-release.apk" "$APK_DIR/$APK_NAME"
|
||||||
|
|
||||||
|
echo "APK erstellt: $APK_DIR/$APK_NAME"
|
||||||
|
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 }}
|
|
||||||
name: ${{ github.ref_name }}
|
|
||||||
files: app/build/outputs/apk/release/*.apk
|
files: app/build/outputs/apk/release/*.apk
|
||||||
body_path: release-notes.md
|
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -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 {
|
||||||
@@ -49,7 +44,6 @@ android {
|
|||||||
buildFeatures {
|
buildFeatures {
|
||||||
compose = true
|
compose = true
|
||||||
}
|
}
|
||||||
sourceSets["main"].assets.srcDir(layout.buildDirectory.dir("generated/changelog"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -69,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) }
|
|
||||||
Reference in new issue
Block a user