retrying upload to apple, introducing retry script

Author: rgaudin

.github/retry-if-retcode.py

@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+import sys
+import time
+
+
+def run_command(
+    max_attempts: int, retcode: int, sleep_seconds: int, command: str
+) -> int:
+    attempts = 0
+    while True:
+        ps = subprocess.run(command, check=False)
+        attempts += 1
+
+        # either suceeded or returned an unexpected exit-code, returning.
+        if ps.returncode == 0 or ps.returncode != retcode:
+            return ps.returncode
+
+        if attempts >= max_attempts:
+            print(f"Reached {max_attempts=}")
+            return ps.returncode
+
+        print(
+            f"Received retcode={ps.returncode} on attempt #{attempts}. "
+            f"Retrying in {sleep_seconds}s."
+        )
+        if sleep_seconds:
+            time.sleep(sleep_seconds)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="retry-if-retcode", epilog=r"/!\ Append your command after those args!"
+    )
+
+    parser.add_argument(
+        "--retcode",
+        required=True,
+        help="Return code to retry when received",
+        type=int,
+    )
+
+    parser.add_argument(
+        "--attempts",
+        required=False,
+        help="Max number of attempts",
+        type=int,
+        default=10,
+    )
+
+    parser.add_argument(
+        "--sleep",
+        required=False,
+        help="Nb. of seconds to sleep in-between retries",
+        type=int,
+        default=1,
+    )
+
+    args, command = parser.parse_known_args()
+    if not command:
+        print("You must supply a command to run")
+        return 1
+
+    return run_command(
+        max_attempts=args.attempts,
+        retcode=args.retcode,
+        sleep_seconds=args.sleep,
+        command=command,
+    )
+
+
+if __name__ == "__main__":
+    sys.exit(main())

.github/workflows/cd.yml

@@ -1,10 +1,8 @@
 name: CD
 
 on:
-  push:
-    branches: [cd]
   schedule:
-  - cron: '0 1 * * *'
+  - cron: '32 1 * * *'
   workflow_dispatch:
   release:
     types: [published]
@@ -170,45 +168,15 @@ jobs:
         APPLE_STORE_AUTH_KEY_PATH: ${{ env.APPLE_STORE_AUTH_KEY_PATH }}
         APPLE_STORE_AUTH_KEY_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ID }}
         APPLE_STORE_AUTH_KEY_ISSUER_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ISSUER_ID }}
-
-      run: xcrun xcodebuild -exportArchive -archivePath $PWD/Kiwix-$VERSION.xcarchive -exportPath $PWD/export/ -exportOptionsPlist export.plist -authenticationKeyPath $APPLE_STORE_AUTH_KEY_PATH -allowProvisioningUpdates -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID
+      run: python .github/retry-if-retcode.py --sleep 60 --attempts 5 --retcode 70 xcrun xcodebuild -exportArchive -archivePath $PWD/Kiwix-$VERSION.xcarchive -exportPath $PWD/export/ -exportOptionsPlist export.plist -authenticationKeyPath $APPLE_STORE_AUTH_KEY_PATH -allowProvisioningUpdates -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID
 
     - name: Export notarized App from archive
       if: ${{ matrix.destination.uploadto == 'dmg' }}
       env:
         APPLE_STORE_AUTH_KEY_PATH: ${{ env.APPLE_STORE_AUTH_KEY_PATH }}
         APPLE_STORE_AUTH_KEY_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ID }}
         APPLE_STORE_AUTH_KEY_ISSUER_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ISSUER_ID }}
-      run: |
-        set +e
-        attempts=0
-        retcode=-1
-        until [[ $retcode -eq 0 ]]
-        do
-          ((attempts++))
-          xcrun xcodebuild -exportNotarizedApp -archivePath $PWD/Kiwix-$VERSION.xcarchive -exportPath $PWD/export/ -authenticationKeyPath $APPLE_STORE_AUTH_KEY_PATH -allowProvisioningUpdates -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID
-          retcode=$?
-
-          if [[ $retcode -eq 0 ]]
-          then
-            echo "Export suceedeed"
-            break
-          fi
-
-          if [[ ! $retcode -eq 65 ]]
-          then
-            echo "Non-65 exit-code, propagating: {$retcode}"
-            return $retcode
-          fi
-
-          if [[ $attempts -ge 20 ]]
-          then
-            echo "Too many attempts (${attempts}), exiting ${retcode}"
-            return $retcode
-          fi
-          echo "Not notarized ; retrying in a minute"
-          sleep 60
-        done
+      run: python .github/retry-if-retcode.py --sleep 60 --attempts 20 --retcode 65 xcrun xcodebuild -exportNotarizedApp -archivePath $PWD/Kiwix-$VERSION.xcarchive -exportPath $PWD/export/ -authenticationKeyPath $APPLE_STORE_AUTH_KEY_PATH -allowProvisioningUpdates -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID
 
     - name: Create DMG
       if: ${{ matrix.destination.uploadto == 'dmg' }}