alpine -> debian

2 files changed, 27 insertions, 13 deletions

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 13c5e87..9fa42f8 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -7,20 +7,34 @@ on:
     branches:
       - "master"
 
-env:
-  ANDROID_HOME: /opt/toolcache/android-sdk
-  FDROID_JKS: /opt/toolcache/android-jks/fdroid.jks
-  GRADLE_USER_HOME: /opt/toolcache/gradle
-
 jobs:
   build:
-    runs-on: alpine-3.16
+    runs-on: ubuntu-latest
+    env:
+      ANDROID_HOME: /toolcache/android-sdk
+      FDROID_JKS: /toolcache/android-jks/fdroid.jks
+      GRADLE_USER_HOME: /toolcache/gradle
     steps:
     - uses: actions/checkout@v3
-    - run: chmod 0755 ./gradlew
-    - run: ./gradlew --no-daemon tasks
-    - run: ./gradlew --no-daemon assemble
-        -PFDROID_STORE_FILE=$FDROID_JKS
-        -PFDROID_STORE_PASSWORD=$FDROID_STORE_PASSWORD
-        -PFDROID_KEY_ALIAS=fdroid
-        -PFDROID_KEY_PASSWORD=$FDROID_KEY_PASSWORD
+
+    - name: assemble fdroid
+      run: |
+        bash ./gradlew --no-daemon assembleFdroid \
+          -PFDROID_STORE_FILE=${FDROID_JKS} \
+          -PFDROID_STORE_PASSWORD=${{ secrets.FDROID_STORE_PASSWORD }} \
+          -PFDROID_KEY_ALIAS=fdroid \
+          -PFDROID_KEY_PASSWORD=${{ secrets.FDROID_KEY_PASSWORD }}
+
+    - name: prepare ssh
+      run: |
+        mkdir -p ~/.ssh
+        echo "${{ secrets.APK_DEPLOY_SSH_KEY }}" | tr -d \\r > ~/.ssh/id_ed25519
+        chmod 600 ~/.ssh/id_ed25519
+
+    - name: deploy apks
+      run: |
+        find . -name '*.apk' -type f | while read APK; do
+          scp -oStrictHostKeyChecking=no $APK ${{ secrets.APK_DEPLOY_USER }}@${{ secrets.APK_DEPLOY_HOST }}:fdroid/repo/
+        done
+
+        ssh -oStrictHostKeyChecking=no ${{ secrets.APK_DEPLOY_USER }}@${{ secrets.APK_DEPLOY_HOST }} sudo -u docker-mgr /usr/local/sbin/fdroid-update-repo
diff --git a/gradlew b/gradlew
index cccdd3d..cccdd3d 100644..100755
--- a/gradlew
+++ b/gradlew