Update other workflows

.forgejo/workflows/sync-main.yml

@@ -2,7 +2,7 @@ on:
   workflow_dispatch:
 
   schedule:
-    - cron: '@hourly'
+    - cron: '0 */4 * * *'
 
 jobs:
   mirror-main:
@@ -15,14 +15,14 @@ jobs:
       downstream: https://ayakael.net/api/packages/alpine/alpine/edge/main
     steps:
       - name: Environment setup
-        run: apk add grep coreutils gawk curl
+        run: apk add grep coreutils gawk curl wget
       - name: Fetch info from upstream
         run: |
           apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $upstream update
           apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $upstream list | grep -v installed | awk '{print $1, $2}' | sort > upstream
       - name: Fetch info from downstream
         run: |
-          apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $downstream update || true
+          ! apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $downstream update
           apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $downstream list | grep -v installed | awk '{print $1, $2}' | sort > downstream
       - name: Missing apks detection
         run: |
@@ -31,10 +31,22 @@ jobs:
           cat missing
       - name: Send missing packages downstream
         run: |
+          wc -l missing | awk '{print $1}' > total
+          read total < total
+          count=1
           while read pkgs; do
-            echo "Sending $pkgs"
+            echo "[ $count / $total ] Sending $pkgs"
-            # if fails continue
+            # github actions doesn't do double pipe error suppression, use !
-            wget $upstream/x86_64/$pkgs.apk || continue
+            ! wget -q $upstream/x86_64/$pkgs.apk
-            curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file $pkgs.apk $downstream
+            # if it doesn't exist, it is because it failed to download. 
-            rm $pkgs.apk
+            if [ -f $pkgs.apk ]; then
+              result=`curl -s --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file $pkgs.apk $downstream`
+              if [ -n "$result" ]; then
+                echo $result
+              fi
+              rm -f $pkgs.apk
+            else
+              echo "Error: Couldn't download $pkgs"
+            fi
+            count=$(( count + 1 ))
           done < missing

.forgejo/workflows/sync-testing.yml

@@ -1,6 +1,9 @@
 on:
   workflow_dispatch:
 
+  schedule:
+    - cron: '0 */4 * * *'
+
 jobs:
   mirror-testing:
     name: Mirror testing apks downstream
@@ -12,14 +15,14 @@ jobs:
       downstream: https://ayakael.net/api/packages/alpine/alpine/edge/testing
     steps:
       - name: Environment setup
-        run: apk add grep coreutils gawk curl
+        run: apk add grep coreutils gawk curl wget
       - name: Fetch info from upstream
         run: |
           apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $upstream update
           apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $upstream list | grep -v installed | awk '{print $1, $2}' | sort > upstream
       - name: Fetch info from downstream
         run: |
-          apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $downstream update || true
+          ! apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $downstream update
           apk --allow-untrusted --update-cache --repositories-file /dev/null --repository $downstream list | grep -v installed | awk '{print $1, $2}' | sort > downstream
       - name: Missing apks detection
         run: |
@@ -28,10 +31,22 @@ jobs:
           cat missing
       - name: Send missing packages downstream
         run: |
+          wc -l missing | awk '{print $1}' > total
+          read total < total
+          count=1
           while read pkgs; do
-            echo "Sending $pkgs"
+            echo "[ $count / $total ] Sending $pkgs"
-            # if fails continue
+            # github actions doesn't do double pipe error suppression, use !
-            wget $upstream/x86_64/$pkgs.apk || continue
+            ! wget -q $upstream/x86_64/$pkgs.apk
-            curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file $pkgs.apk $downstream
+            # if it doesn't exist, it is because it failed to download. 
-            rm $pkgs.apk
+            if [ -f $pkgs.apk ]; then
+              result=`curl -s --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file $pkgs.apk $downstream`
+              if [ -n "$result" ]; then
+                echo $result
+              fi
+              rm -f $pkgs.apk
+            else
+              echo "Error: Couldn't download $pkgs"
+            fi
+            count=$(( count + 1 ))
           done < missing