From e07413eda5c3fca6c2924f9c6de8b0ad41c795bc Mon Sep 17 00:00:00 2001 From: zyphlar Date: Fri, 31 Oct 2025 14:04:55 -0700 Subject: [PATCH] use new rclone script Signed-off-by: zyphlar --- .forgejo/workflows/map-generator.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/map-generator.yml b/.forgejo/workflows/map-generator.yml index 2d4cc0cb0..828deef84 100644 --- a/.forgejo/workflows/map-generator.yml +++ b/.forgejo/workflows/map-generator.yml @@ -463,22 +463,8 @@ jobs: mkdir -p ~/.config/rclone/ echo "${{ secrets.RCLONE_CONF }}" > ~/.config/rclone/rclone.conf head -n3 ~/.config/rclone/rclone.conf - - name: Upload map files to CDNs + - name: Upload map files to CDNs via RClone shell: bash run: | - shopt -s nullglob - buildfolder=$(find /root/OM/osm-maps/ -mindepth 1 -maxdepth 1 -iname 2* -type d | sort -n -r | head -1 | cut -d/ -f5) - builddate=$(find /root/OM/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname 2* -type d | sort -n -r | head -1 | cut -d/ -f6) - mwmfiles=( /root/OM/osm-maps/$buildfolder/$builddate/*.mwm ) - - if (( ${#mwmfiles[@]} )); then - echo "<$(date +%T)> Uploading maps from $buildfolder/$builddate..." - cd /tools/unix/maps - ./upload_to_cdn.sh /root/OM/osm-maps/$buildfolder/$builddate - else - echo "<$(date +%T)> No MWM files in /root/OM/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps." - echo "<$(date +%T)> Found top level: $(ls -alt /root/OM/osm-maps/*)" - echo "<$(date +%T)> Found second level: $(ls -alt /root/OM/osm-maps/$buildfolder/*)" - fi - - \ No newline at end of file + cd /root/OM/comaps-init + ./tools/unix/maps/upload_to_cdn.sh