Build: Android-Signierung hinzugefügt
Some checks failed
Android Build Final Fixed / build-android (push) Failing after 7m12s
Some checks failed
Android Build Final Fixed / build-android (push) Failing after 7m12s
This commit is contained in:
@@ -44,7 +44,6 @@ jobs:
|
|||||||
wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
|
wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
|
||||||
unzip -q commandlinetools-linux-9477386_latest.zip
|
unzip -q commandlinetools-linux-9477386_latest.zip
|
||||||
mv cmdline-tools latest
|
mv cmdline-tools latest
|
||||||
# Wir installieren 33 vor, aber Gradle wird im Build-Schritt evtl. auf 35/36 upgraden
|
|
||||||
yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME "platform-tools" "platforms;android-33" "build-tools;33.0.1" "ndk;25.1.8937393"
|
yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME "platform-tools" "platforms;android-33" "build-tools;33.0.1" "ndk;25.1.8937393"
|
||||||
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
|
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
|
||||||
echo "NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393" >> $GITHUB_ENV
|
echo "NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393" >> $GITHUB_ENV
|
||||||
@@ -59,28 +58,32 @@ jobs:
|
|||||||
# 1. Frontend bauen
|
# 1. Frontend bauen
|
||||||
trunk build --release
|
trunk build --release
|
||||||
|
|
||||||
# 2. Android Build
|
# 2. Android Build initialisieren falls nötig und bauen
|
||||||
if [ ! -d "src-tauri/gen/android" ]; then
|
if [ ! -d "src-tauri/gen/android" ]; then
|
||||||
cargo-tauri android init
|
cargo-tauri android init
|
||||||
fi
|
fi
|
||||||
cargo-tauri android build --target aarch64 --apk true
|
cargo-tauri android build --target aarch64 --apk true
|
||||||
|
|
||||||
# 3. APK manuell signieren
|
# 3. APK manuell signieren
|
||||||
echo "Erstelle Keystore..."
|
echo "Erstelle Keystore aus Secret..."
|
||||||
# printf und tr stellen sicher, dass kein Müll im Keystore landet
|
# printf und tr -d entfernen alle Whitespaces, um java.io.EOFException zu vermeiden
|
||||||
printf "%s" "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | tr -d '[:space:]' | base64 -d > release.keystore
|
printf "%s" "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | tr -d '[:space:]' | base64 -d > release.keystore
|
||||||
|
|
||||||
if [ ! -s release.keystore ]; then
|
if [ ! -s release.keystore ]; then
|
||||||
echo "FEHLER: Keystore-Datei ist leer!"
|
echo "FEHLER: Keystore-Datei ist leer! Prüfe das Secret ANDROID_KEYSTORE_BASE64."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Suche unsignierte APK..."
|
echo "Suche unsignierte APK..."
|
||||||
UNSIGNED_APK=$(find src-tauri/gen/android/app/build/outputs/apk/universal/release -name "*-unsigned.apk" | head -n 1)
|
UNSIGNED_APK=$(find src-tauri/gen/android/app/build/outputs/apk/universal/release -name "*-unsigned.apk" | head -n 1)
|
||||||
|
if [ -z "$UNSIGNED_APK" ]; then
|
||||||
|
echo "FEHLER: Keine unsignierte APK gefunden!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
echo "Gefunden: $UNSIGNED_APK"
|
echo "Gefunden: $UNSIGNED_APK"
|
||||||
|
|
||||||
echo "Suche apksigner..."
|
echo "Suche apksigner..."
|
||||||
# Da dein Log zeigt, dass Version 35.0.0 installiert wurde, suchen wir dynamisch die neueste
|
# Findet die aktuellste Version der Build-Tools (z.B. 35.0.0)
|
||||||
APKSIGNER=$(find $ANDROID_HOME/build-tools -name apksigner | sort -r | head -n 1)
|
APKSIGNER=$(find $ANDROID_HOME/build-tools -name apksigner | sort -r | head -n 1)
|
||||||
echo "Nutze apksigner unter: $APKSIGNER"
|
echo "Nutze apksigner unter: $APKSIGNER"
|
||||||
|
|
||||||
@@ -88,6 +91,7 @@ jobs:
|
|||||||
--ks-key-alias "${{ secrets.ANDROID_KEY_ALIAS }}" \
|
--ks-key-alias "${{ secrets.ANDROID_KEY_ALIAS }}" \
|
||||||
--ks-pass pass:"${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" \
|
--ks-pass pass:"${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" \
|
||||||
--key-pass pass:"${{ secrets.ANDROID_KEY_PASSWORD }}" \
|
--key-pass pass:"${{ secrets.ANDROID_KEY_PASSWORD }}" \
|
||||||
|
--v4-signing-enabled true \
|
||||||
--out Marstemedia-Signed.apk \
|
--out Marstemedia-Signed.apk \
|
||||||
"$UNSIGNED_APK"
|
"$UNSIGNED_APK"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user