chore: adjust workflow

This commit is contained in:
robin committed 2026-10-07 16:49:40 +02:00
1 parent d03f9eee67
commit bc6edc4a04
1 file changed
+15 -25
+15 -25
View File
@@ -50,7 +50,7 @@ jobs:
"$SDKMANAGER" --sdk_root="$SDK_PATH" \ "$SDKMANAGER" --sdk_root="$SDK_PATH" \
"platform-tools" \ "platform-tools" \
"platforms;android-35" \ "platforms;android-37" \
"build-tools;35.0.0" "build-tools;35.0.0"
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
@@ -64,7 +64,7 @@ jobs:
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore" echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
- name: Android Release APKs bauen - name: Android Release APK bauen
run: | run: |
set -euo pipefail set -euo pipefail
@@ -79,33 +79,23 @@ jobs:
APK_DIR="app/build/outputs/apk/release" APK_DIR="app/build/outputs/apk/release"
echo "Gefundene Original-APKs in $APK_DIR:" echo "Gefundene APKs in $APK_DIR:"
ls -lh "$APK_DIR" ls -lh "$APK_DIR"
for APK in "$APK_DIR"/*.apk; do SRC="$APK_DIR/app-release.apk"
[ -e "$APK" ] || continue if [ ! -f "$SRC" ]; then
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
exit 1
fi
if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
continue mv "$SRC" "$TARGET_PATH"
fi
FILENAME=$(basename "$APK") echo "Signatur prüfen für $(basename "$TARGET_PATH")..."
VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/') "$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
if [ "$VARIANT" = "$FILENAME" ]; then
VARIANT="release"
fi
TARGET_NAME="WeekFocus-${VERSION}-${VARIANT}.apk" echo "Finale Release-APK:"
TARGET_PATH="$APK_DIR/$TARGET_NAME" ls -lh "$TARGET_PATH"
mv "$APK" "$TARGET_PATH"
echo "Signatur prüfen für $TARGET_NAME..."
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
done
echo "Finale Release-APKs:"
ls -lh "$APK_DIR"/WeekFocus-*.apk
env: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -142,7 +132,7 @@ jobs:
echo "Release-Notes:" echo "Release-Notes:"
cat "$NOTES_FILE" cat "$NOTES_FILE"
- name: Release in Gitea erstellen und APKs hochladen - name: Release in Gitea erstellen und APK hochladen
env: env:
TOKEN: ${{ secrets.GITHUB_TOKEN }} TOKEN: ${{ secrets.GITHUB_TOKEN }}
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }} API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}