diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml index dcf1e316d5..9e63269d83 100644 --- a/.forgejo/workflows/on_release.yml +++ b/.forgejo/workflows/on_release.yml @@ -61,6 +61,6 @@ jobs: shell: bash run: | TAG=$( echo ${{ env.GITHUB_REF_NAME }} ) - scp android/app/build/outputs/apk/release/app-release.apk hetzner:~/apk/mapcomplete-$TAG.apk - ssh hetzner 'cp "apk/$(ls -v apk/ | tail -n 1)" app/mapcomplete-latest.apk' + scp android/app/build/outputs/apk/release/app-release.apk hetzner:~/public/apk/mapcomplete-$TAG.apk + ssh hetzner 'cp "public/apk/$(ls -v apk/ | tail -n 1)" app/mapcomplete-latest.apk' diff --git a/Docs/ServerConfig/hetzner/Caddyfile b/Docs/ServerConfig/hetzner/Caddyfile index 38d05eb3ef..85dad9f293 100644 --- a/Docs/ServerConfig/hetzner/Caddyfile +++ b/Docs/ServerConfig/hetzner/Caddyfile @@ -49,10 +49,8 @@ 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 diff --git a/scripts/prepareAndroid.sh b/scripts/prepareAndroid.sh index 8d40b33010..c7e890dbb2 100755 --- a/scripts/prepareAndroid.sh +++ b/scripts/prepareAndroid.sh @@ -58,13 +58,17 @@ cp -r dist/assets/docs dist-full/assets/ cp -r dist/assets/fonts dist-full/assets/ cp -r dist/assets/langs dist-full/assets/ cp -r dist/assets/layers dist-full/assets/ +# We need the assets in the layers, but not the actual layer files, which can take quite a bit of space +rm dist-full/assets/layers/*/*.json cp -r dist/assets/png dist-full/assets/ cp -r dist/assets/svg dist-full/assets/ cp -r dist/assets/templates dist-full/assets/ cp -r dist/assets/generated/themes/ dist-full/assets/generated/ cp -r dist/assets/themes dist-full/assets/ -cp dist/assets/*.js.map dist-full/assets/ +# cp dist/assets/*.js.map dist-full/assets/ rm -rf dist-full/assets/data/nsi +rm dist-full/assets/layers/*/*.json +rm dist-full/assets/*/*/*.license # mkdir dist-full/assets/generated nvm use