Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc6edc4a04 | ||
|
|
d03f9eee67 | ||
|
|
7eff7300d0 | ||
|
|
e444abecae | ||
|
|
3bac488893 | ||
|
|
b8195b74f1 | ||
|
|
f431fb272d | ||
|
|
107f1c3955 | ||
|
|
ce1eba6b83 | ||
|
|
4b8e2bc88d | ||
|
|
c71851702f | ||
|
|
4c04a5260c | ||
|
|
82d4fa331b |
No files matched your search
@@ -48,6 +48,11 @@ jobs:
|
||||
|
||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
|
||||
|
||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
||||
"platform-tools" \
|
||||
"platforms;android-37" \
|
||||
"build-tools;35.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"
|
||||
@@ -59,7 +64,7 @@ jobs:
|
||||
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
|
||||
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
|
||||
|
||||
- name: Android Release APKs bauen
|
||||
- name: Android Release APK bauen
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
@@ -68,38 +73,29 @@ jobs:
|
||||
|
||||
./gradlew assembleRelease \
|
||||
--no-daemon \
|
||||
-Dorg.gradle.java.home="$JAVA_HOME" \
|
||||
-Porg.gradle.java.installations.auto-download=false \
|
||||
-PversionNameOverride="$VERSION"
|
||||
|
||||
APK_DIR="app/build/outputs/apk/release"
|
||||
|
||||
echo "Gefundene Original-APKs in $APK_DIR:"
|
||||
echo "Gefundene APKs in $APK_DIR:"
|
||||
ls -lh "$APK_DIR"
|
||||
|
||||
for APK in "$APK_DIR"/*.apk; do
|
||||
[ -e "$APK" ] || continue
|
||||
|
||||
if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then
|
||||
continue
|
||||
fi
|
||||
SRC="$APK_DIR/app-release.apk"
|
||||
if [ ! -f "$SRC" ]; then
|
||||
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
FILENAME=$(basename "$APK")
|
||||
VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/')
|
||||
if [ "$VARIANT" = "$FILENAME" ]; then
|
||||
VARIANT="release"
|
||||
fi
|
||||
TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
|
||||
mv "$SRC" "$TARGET_PATH"
|
||||
|
||||
TARGET_NAME="WeekFocus-${VERSION}-${VARIANT}.apk"
|
||||
TARGET_PATH="$APK_DIR/$TARGET_NAME"
|
||||
echo "Signatur prüfen für $(basename "$TARGET_PATH")..."
|
||||
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
|
||||
|
||||
mv "$APK" "$TARGET_PATH"
|
||||
|
||||
echo "Signatur prüfen für $TARGET_NAME..."
|
||||
APKSIGNER=$(find "$ANDROID_HOME/build-tools" -name "apksigner" | sort -V | tail -n 1)
|
||||
"$APKSIGNER" verify --verbose "$TARGET_PATH"
|
||||
done
|
||||
|
||||
echo "Finale Release-APKs:"
|
||||
ls -lh "$APK_DIR"/WeekFocus-*.apk
|
||||
echo "Finale Release-APK:"
|
||||
ls -lh "$TARGET_PATH"
|
||||
env:
|
||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||
@@ -136,7 +132,7 @@ jobs:
|
||||
echo "Release-Notes:"
|
||||
cat "$NOTES_FILE"
|
||||
|
||||
- name: Release in Gitea erstellen und APKs hochladen
|
||||
- name: Release in Gitea erstellen und APK hochladen
|
||||
env:
|
||||
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||
@@ -154,11 +150,11 @@ jobs:
|
||||
else
|
||||
IS_PRERELEASE="false"
|
||||
fi
|
||||
|
||||
|
||||
jq -n --arg tag "$TAG" --arg name "$TAG" --rawfile body "$NOTES_FILE" \
|
||||
--argjson prerelease "$IS_PRERELEASE" \
|
||||
'{tag_name:$tag, name:$name, body:$body, prerelease:$prerelease}' > payload.json
|
||||
|
||||
|
||||
curl -fsS -X POST -H "$AUTH" -H "Content-Type: application/json" \
|
||||
-d @payload.json "$API/releases" -o release.json
|
||||
elif [ "$CODE" != "200" ]; then
|
||||
@@ -166,18 +162,18 @@ jobs:
|
||||
cat release.json
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
RELEASE_ID=$(jq -r .id release.json)
|
||||
|
||||
for APK in app/build/outputs/apk/release/WeekFocus-*.apk; do
|
||||
[ -e "$APK" ] || continue
|
||||
NAME=$(basename "$APK")
|
||||
echo "Lade Hoch: $NAME"
|
||||
|
||||
|
||||
for ID in $(jq -r --arg n "$NAME" '.assets[]? | select(.name==$n) | .id' release.json); do
|
||||
curl -fsS -X DELETE -H "$AUTH" "$API/releases/$RELEASE_ID/assets/$ID"
|
||||
done
|
||||
|
||||
|
||||
curl -fsS -X POST -H "$AUTH" -F "attachment=@$APK" \
|
||||
"$API/releases/$RELEASE_ID/assets?name=$NAME"
|
||||
done
|
||||
Generated
+1
-1
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
@@ -27,14 +27,15 @@ android {
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
splits {
|
||||
// not necessary
|
||||
/*splits {
|
||||
abi {
|
||||
isEnable = true
|
||||
reset()
|
||||
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
|
||||
isUniversalApk = true
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
@@ -56,8 +57,13 @@ android {
|
||||
release {
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
optimization {
|
||||
enable = false
|
||||
enable = true
|
||||
}
|
||||
isShrinkResources = true
|
||||
proguardFiles(
|
||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
#This file is generated by updateDaemonJvm
|
||||
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
|
||||
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
|
||||
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
|
||||
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
|
||||
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
|
||||
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
|
||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
|
||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
|
||||
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
|
||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
|
||||
toolchainVersion=25
|
||||
Reference in new issue
Block a user