From 81a92b3b5f9301a5c6fea387df1daeba6cee701b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= <k.vycius@gmail.com>
Date: Tue, 30 Jul 2024 16:05:15 +0300
Subject: [PATCH] Change update checking order

---
 .../workflows/basemap-vector-data-source.yml  | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/basemap-vector-data-source.yml b/.github/workflows/basemap-vector-data-source.yml
index 1a72620..3940a55 100644
--- a/.github/workflows/basemap-vector-data-source.yml
+++ b/.github/workflows/basemap-vector-data-source.yml
@@ -59,6 +59,18 @@ jobs:
         working-directory: output
         run: md5sum houses-espg-4326.gpkg.zip >> checksums.txt
 
+      - name: Download latest data source hashes
+        run: wget -O published-data-source-checksums.txt "https://cdn.biip.lt/tiles/vector/sources/address-registry/data-source-checksums.txt"
+
+      - name: Check that the files are the exact same
+        id: comparison
+        run: |
+          { 
+            echo 'diff<<EOF'
+            (diff -u 'published-data-source-checksums.txt' 'output/data-source-checksums.txt' || :)
+            echo 'EOF'
+          } >> "${GITHUB_OUTPUT}"
+
       - name: Upload to S3
         uses: ./.github/actions/rclone-sync
         with:
@@ -76,18 +88,6 @@ jobs:
           if-no-files-found: error
           compression-level: 0
 
-      - name: Download latest data source hashes
-        run: wget -O published-data-source-checksums.txt "https://cdn.biip.lt/tiles/vector/sources/address-registry/data-source-checksums.txt"
-
-      - name: Check that the files are the exact same
-        id: comparison
-        run: |
-          { 
-            echo 'diff<<EOF'
-            (diff -u 'published-data-source-checksums.txt' 'output/data-source-checksums.txt' || :)
-            echo 'EOF'
-          } >> "${GITHUB_OUTPUT}"
-
   basemap-vector-datasource-grpk:
     name: GRPK sync and transform
     runs-on: ubuntu-latest
@@ -128,15 +128,6 @@ jobs:
         working-directory: output
         run: md5sum grpk-espg-4326.shp.zip >> checksums.txt
 
-      - name: Upload to S3
-        uses: ./.github/actions/rclone-sync
-        with:
-          s3-endpoint: ${{ vars.S3_ENDPOINT }}
-          s3-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
-          s3-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}
-          source-path: output
-          destination-path: /tiles/vector/sources/grpk
-
       - name: Download latest data source hashes
         run: wget -O published-data-source-checksums.txt "https://cdn.biip.lt/tiles/vector/sources/grpk/data-source-checksums.txt"
 
@@ -149,6 +140,16 @@ jobs:
             echo 'EOF'
           } >> "${GITHUB_OUTPUT}"
 
+      - name: Upload to S3
+        uses: ./.github/actions/rclone-sync
+        with:
+          s3-endpoint: ${{ vars.S3_ENDPOINT }}
+          s3-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
+          s3-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}
+          source-path: output
+          destination-path: /tiles/vector/sources/grpk
+
+
   basemap-vector-datasource-stvk:
     name: STVK sync and transform
     runs-on: ubuntu-latest