hmalik144/simple-notes-sync
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Workflow für F-Droid APKs + Emoji-Fixes + Korrekturen [skip ci]

Browse Source 
- 📦 F-Droid Flavor APKs werden jetzt mit gebaut (6 statt 3 APKs)
- 🎉 README Emoji-Darstellungsfehler behoben
- 🇩🇪 Workflow-Kommentare auf Deutsch
- ✅ Korrekte Beschreibung: HTTP/HTTPS wählbar (nicht nur HTTPS)
- 💡 Klarstellung: Standard + F-Droid sind identisch (100% FOSS)
This commit is contained in:
inventory69
2025-12-22 14:54:49 +01:00
parent 55401977e3
commit 70efc13ea4
2 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
.github/workflows/build-production-apk.yml vendored
View File

@@ -2,11 +2,11 @@ name: Build Android Production APK
on: on:
push: push:
branches: [ main ] # Trigger on push to main branch branches: [ main ] # Nur bei Push/Merge auf main triggern
workflow_dispatch: # Allow manual trigger workflow_dispatch: # Ermöglicht manuellen Trigger
permissions: permissions:
contents: write # Required for creating releases contents: write # Für Release-Erstellung erforderlich
jobs: jobs:
build: build:
@@ -14,81 +14,95 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout code - name: Code auschecken
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Java - name: Java einrichten
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: '17' java-version: '17'
- name: Generate Production version number - name: Semantic Versionsnummer aus build.gradle.kts extrahieren
run: | run: |
# Extract version from build.gradle.kts # Version aus build.gradle.kts für F-Droid Kompatibilität
VERSION_NAME=$(grep "versionName = " android/app/build.gradle.kts | sed 's/.*versionName = "\(.*\)".*/\1/') VERSION_NAME=$(grep "versionName = " android/app/build.gradle.kts | sed 's/.*versionName = "\(.*\)".*/\1/')
VERSION_CODE=$(grep "versionCode = " android/app/build.gradle.kts | sed 's/.*versionCode = \([0-9]*\).*/\1/') VERSION_CODE=$(grep "versionCode = " android/app/build.gradle.kts | sed 's/.*versionCode = \([0-9]*\).*/\1/')
# Use extracted version for F-Droid compatibility # Semantische Versionierung (nicht datums-basiert)
BUILD_NUMBER="$VERSION_CODE" BUILD_NUMBER="$VERSION_CODE"
echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
echo "VERSION_TAG=v$VERSION_NAME" >> $GITHUB_ENV echo "VERSION_TAG=v$VERSION_NAME" >> $GITHUB_ENV
echo "🚀 Building version: $VERSION_NAME (code: $BUILD_NUMBER)" echo "🚀 Baue Version: $VERSION_NAME (Code: $BUILD_NUMBER)"
- name: Verify build.gradle.kts version - name: Version aus build.gradle.kts verifizieren
run: | run: |
echo "✅ Using version from build.gradle.kts:" echo "✅ Verwende Version aus build.gradle.kts:"
grep -E "versionCode|versionName" android/app/build.gradle.kts grep -E "versionCode|versionName" android/app/build.gradle.kts
- name: Setup Android signing - name: Android Signing konfigurieren
run: | run: |
echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > android/app/simple-notes-release.jks echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > android/app/simple-notes-release.jks
echo "storePassword=${{ secrets.KEYSTORE_PASSWORD }}" > android/key.properties echo "storePassword=${{ secrets.KEYSTORE_PASSWORD }}" > android/key.properties
echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/key.properties echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/key.properties
echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/key.properties echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/key.properties
echo "storeFile=simple-notes-release.jks" >> android/key.properties echo "storeFile=simple-notes-release.jks" >> android/key.properties
echo "✅ Signing configuration created" echo "✅ Signing-Konfiguration erstellt"
- name: Build Production APK (Release) - name: Produktions-APK bauen (Standard + F-Droid Flavors)
run: | run: |
cd android cd android
./gradlew assembleStandardRelease --no-daemon --stacktrace ./gradlew assembleStandardRelease assembleFdroidRelease --no-daemon --stacktrace
- name: Copy APK variants to root with version names - name: APK-Varianten mit Versionsnamen kopieren
run: | run: |
mkdir -p apk-output mkdir -p apk-output
# Universal APK # === Standard Flavor (mit Google Services) ===
# Universal APK (funktioniert auf allen Geräten)
cp android/app/build/outputs/apk/standard/release/app-standard-universal-release.apk \ cp android/app/build/outputs/apk/standard/release/app-standard-universal-release.apk \
apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-universal.apk apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-standard-universal.apk
# ARM64 APK (moderne Geräte 2018+)
cp android/app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release.apk \
apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-standard-arm64-v8a.apk
# ARMv7 APK (ältere Geräte)
cp android/app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release.apk \
apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-standard-armeabi-v7a.apk
# === F-Droid Flavor (ohne Google Services) ===
# Universal APK
cp android/app/build/outputs/apk/fdroid/release/app-fdroid-universal-release.apk \
apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-fdroid-universal.apk
# ARM64 APK # ARM64 APK
cp android/app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release.apk \ cp android/app/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release.apk \
apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-arm64-v8a.apk apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-fdroid-arm64-v8a.apk
# ARMv7 APK # ARMv7 APK
cp android/app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release.apk \ cp android/app/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release.apk \
apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-armeabi-v7a.apk apk-output/simple-notes-sync-v${{ env.VERSION_NAME }}-fdroid-armeabi-v7a.apk
echo "✅ APK files prepared:" echo "✅ APK-Dateien vorbereitet (Standard + F-Droid):"
ls -lh apk-output/ ls -lh apk-output/
- name: Upload APK artifacts - name: APK-Artefakte hochladen
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: simple-notes-sync-apks-v${{ env.VERSION_NAME }} name: simple-notes-sync-apks-v${{ env.VERSION_NAME }}
path: apk-output/*.apk path: apk-output/*.apk
retention-days: 90 # Keep production builds longer retention-days: 90 # Produktions-Builds länger aufbewahren
- name: Get commit info - name: Commit-Informationen auslesen
run: | run: |
echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "COMMIT_DATE=$(git log -1 --format=%cd --date=iso-strict)" >> $GITHUB_ENV echo "COMMIT_DATE=$(git log -1 --format=%cd --date=iso-strict)" >> $GITHUB_ENV
# Get full commit message preserving newlines and emojis (UTF-8) # Vollständige Commit-Nachricht mit Zeilenumbrüchen und Emojis (UTF-8)
{ {
echo 'COMMIT_MSG<<EOF' echo 'COMMIT_MSG<<EOF'
git -c core.quotepath=false log -1 --pretty=%B git -c core.quotepath=false log -1 --pretty=%B
@@ -126,11 +140,21 @@ jobs:
### Welche APK soll ich herunterladen? ### Welche APK soll ich herunterladen?
| Dein Gerät | Lade diese APK herunter | Größe | Kompatibilität | **Flavor-Wahl (beide identisch, nur für verschiedene Stores):**
|------------|------------------------|-------|----------------| - **Standard**: Für direkten Download / Obtainium / GitHub Releases
| 🤷 Nicht sicher? | `simple-notes-sync-v${{ env.VERSION_NAME }}-universal.apk` | ~5 MB | Funktioniert auf allen Geräten | - **F-Droid**: Für F-Droid Store (identisch, nur andere Kennzeichnung)
| Modern (2018+) | `simple-notes-sync-v${{ env.VERSION_NAME }}-arm64-v8a.apk` | ~3 MB | Schneller, kleiner |
| Ältere Geräte | `simple-notes-sync-v${{ env.VERSION_NAME }}-armeabi-v7a.apk` | ~3 MB | Ältere ARM-Chips | 💡 **Hinweis:** Beide Flavors sind 100% FOSS - keine Google Services, kein Tracking!
**Architektur-Wahl:**
| Dein Gerät | Standard Flavor | F-Droid Flavor | Größe | Hinweis |
|------------|----------------|----------------|-------|---------|
| 🤷 Nicht sicher? | `simple-notes-sync-v${{ env.VERSION_NAME }}-standard-universal.apk` | `...-fdroid-universal.apk` | ~5 MB | Funktioniert überall |
| Modern (2018+) | `simple-notes-sync-v${{ env.VERSION_NAME }}-standard-arm64-v8a.apk` | `...-fdroid-arm64-v8a.apk` | ~3 MB | Schneller, kleiner |
| Ältere Geräte | `simple-notes-sync-v${{ env.VERSION_NAME }}-standard-armeabi-v7a.apk` | `...-fdroid-armeabi-v7a.apk` | ~3 MB | ARM-Chips vor 2018 |
💡 **Empfehlung:** Nimm die **Standard Universal** APK!
### Installationsschritte ### Installationsschritte
1. Lade die passende APK aus den Assets unten herunter 1. Lade die passende APK aus den Assets unten herunter
@@ -176,10 +200,10 @@ jobs:
## 🔒 Datenschutz & Sicherheit ## 🔒 Datenschutz & Sicherheit
- Alle Daten werden über deinen eigenen WebDAV-Server synchronisiert - Alle Daten werden über deinen eigenen WebDAV-Server synchronisiert (self-hosted)
- Keine Drittanbieter-Analysen oder Tracking - Keine Drittanbieter-Analysen oder Tracking
- Keine Internet-Berechtigungen außer für WebDAV-Sync - Keine Internet-Berechtigungen außer für WebDAV-Sync
- Alle Synchronisationsvorgänge verschlüsselt (HTTPS) - Unterstützt HTTP (lokal) und HTTPS (extern) - du entscheidest
- Open Source - prüfe den Code selbst - Open Source - prüfe den Code selbst
--- ---

6
README.md
View File

@@ -65,15 +65,15 @@ docker compose up -d
--- ---
## <EFBFBD> Neue Features in v1.1.0 ## 🎉 Neue Features in v1.1.0
### Konfigurierbare Sync-Intervalle ### Konfigurierbare Sync-Intervalle
- ⏱️ Wählbare Intervalle: 15/30/60 Minuten - ⏱️ Wählbare Intervalle: 15/30/60 Minuten
- 📊 Transparente Akkuverbrauchs-Anzeige - 📊 Transparente Akkuverbrauchs-Anzeige
- <EFBFBD> Sofortige Anwendung ohne App-Neustart - ⚡ Sofortige Anwendung ohne App-Neustart
### Über-Sektion ### Über-Sektion
- <EFBFBD> App-Version & Build-Datum - 📱 App-Version & Build-Datum
- 🌐 Links zu GitHub Repo & Entwickler - 🌐 Links zu GitHub Repo & Entwickler
- ⚖️ Lizenz-Information - ⚖️ Lizenz-Information