diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index f41aa07..0f5b8a9 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -60,8 +60,10 @@ jobs: echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties" - name: Keystore dekodieren + env: + KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} run: | - echo "${{ secrets.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 - name: Android Release APK bauen @@ -79,7 +81,7 @@ jobs: echo "Erzeugte APK-Dateien:" find app/build/outputs -type f -name "*.apk" -print - APK_SOURCE="$(find app/build/outputs/apk/release -maxdepth 1 -type f -name "*.apk" | head -n 1)" + APK_SOURCE="$(find app/build/outputs/apk/release -maxdepth 1 -type f -name "*.apk" ! -name "*unsigned*" | head -n 1)" if [ -z "$APK_SOURCE" ]; then echo "Keine Release-APK gefunden." @@ -92,6 +94,8 @@ jobs: mv "$APK_SOURCE" "$APK_TARGET" + "$ANDROID_HOME/build-tools/36.0.0/apksigner" verify --verbose "$APK_TARGET" + echo "APK erstellt: $APK_TARGET" ls -lh "$APK_DIR" env: @@ -99,11 +103,11 @@ jobs: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - - - name: Release in Gitea erstellen uses: softprops/action-gh-release@v2 with: - files: app/build/outputs/apk/release/*.apk + tag_name: ${{ github.ref_name }} + name: ${{ github.ref_name }} + files: app/build/outputs/apk/release/WeekFocus-*.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6a44fd2..365304d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,8 +30,21 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + signingConfigs { + create("release") { + val ksPath = System.getenv("KEYSTORE_PATH") + if (ksPath != null) { + storeFile = file(ksPath) + storePassword = System.getenv("KEYSTORE_PASSWORD") + keyAlias = System.getenv("KEY_ALIAS") + keyPassword = System.getenv("KEY_PASSWORD") + } + } + } + buildTypes { release { + signingConfig = signingConfigs.getByName("release") optimization { enable = false }