From c14624cac4f576740f8b45bb60f2921a16ae8568 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 29 Apr 2025 02:25:56 +0200
Subject: [PATCH] Scripts: actually upload apk

---
 .forgejo/workflows/on_release.yml   | 9 +++++----
 Docs/ServerConfig/hetzner/Caddyfile | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml
index de555e427c..9dfa0b77c5 100644
--- a/.forgejo/workflows/on_release.yml
+++ b/.forgejo/workflows/on_release.yml
@@ -31,9 +31,7 @@ jobs:
           git submodule update
 
       - name: Decode keystore
-        run: |
-          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > ~/.gradle/release-key.jks
-
+        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > ~/.gradle/release-key.jks
 
       - name: Grant execute permission to gradlew
         run: cd android && chmod +x ./gradlew
@@ -51,4 +49,7 @@ jobs:
 
       - name: Upload APK to hetzner
         shell: bash
-        run: ls android/app/build/outputs/apk/release/
+        run: |
+          TAG=$(git describe --tags)
+          BRANCH=$(echo ${{ github.ref_name }} | sed 's/\//-/g')
+          scp android/app/build/outputs/apk/release/app-release.apk hetzner:~/apk/mapcomplete-$TAG.apk
diff --git a/Docs/ServerConfig/hetzner/Caddyfile b/Docs/ServerConfig/hetzner/Caddyfile
index 38960417ea..9049e0afa0 100644
--- a/Docs/ServerConfig/hetzner/Caddyfile
+++ b/Docs/ServerConfig/hetzner/Caddyfile
@@ -49,7 +49,10 @@ single.mapcomplete.org {
 		Report-To "{\"group\":\"csp-endpoint\", \"max_age\":86400, \"endpoints\":[{\"url\":\"https://report.mapcomplete.org/csp\"}], \"include_subdomains\":true}"
 	}
 }
-
+app.mapcomplete.org/builds {
+	file_server browse
+	root * apk/
+}
 app.mapcomplete.org {
 	root * app/
 	file_server