Fix auto-updater upgrader

.gitignore

@@ -6,6 +6,7 @@
 builds
 tools/README-generator/venv/
 tools/bot-repo-cleanup/.github_token
+tools/autoupdater-upgrader/.*
 
 tools/autopatches/login
 tools/autopatches/token

autoupdater-upgrader/README.md

@@ -10,5 +10,7 @@ source venv/bin/activate
 pip install -r requirements.txt
 ```
 
-This script requires a `.github_token` file with a token with public.repo permission.
+This script requires the following files:
-
+- `.github_token` containing a token with `public.repo` and `workflow` permission
+- `.github_login` containing the author's username
+- `.github_email` containing the author's email address

autoupdater-upgrader/autoupdater-upgrader.py

@@ -4,11 +4,12 @@ import sys, os, time
 import urllib.request, json
 import re
 
+from github import Github
+import github
+
 # Debug
 from rich.traceback import install
-install(show_locals=True)
+install(width=150, show_locals=True, locals_max_length=None, locals_max_string=None)
-
-from github import Github
 
 #####
 #
@@ -22,6 +23,9 @@ g = Github(open(".github_token").read().strip())
 # Path to the file to be updated
 path=".github/workflows/updater.yml"
 
+# Title of the PR
+title="[autopatch] Upgrade auto-updater"
+
 # Body of the PR message
 body="""
 Auto-updater actions need upgrading to continue working:
@@ -29,9 +33,21 @@ Auto-updater actions need upgrading to continue working:
 - peter-evans/create-pull-request@v4
 """
 
+# Author of the commit
+author=github.InputGitAuthor(open(".github_login").read().strip(), open(".github_email").read().strip())
+
 # Name of the branch created for the PR
 new_branch="upgrade-auto-updater"
 
+#####
+#
+# CACHE
+#
+#####
+
+with open('processed.txt') as f:
+    processed = f.read().splitlines()
+
 #####
 #
 # CRAWL REPOSITORIES
@@ -42,25 +58,34 @@ u = g.get_user("yunohost-bot")
 org = g.get_organization("yunohost-apps")
 
 # For each repositories belonging to the bot (user `u`)
+i=0
 for repo in org.get_repos():
+    if repo.full_name not in processed:
+
         # Determine base branch, either `testing` or default branch
         try:
             base_branch = repo.get_branch("testing").name
         except:
             base_branch = repo.default_branch
+
         # Make sure the repository has an auto-updater
         try:
             repo.get_contents(path, ref="refs/heads/"+base_branch)
         except:
-        print("No updater in "+repo.full_name)
+            with open('processed.txt', 'a') as pfile:
+                pfile.write(repo.full_name+'\n')
+            time.sleep(1.5)
             continue
+
         # Process the repo
-    try:
         print("Processing "+repo.full_name)
 
+        try:
             # Get the commit base for the new branch, and create it
             commit_sha = repo.get_branch(base_branch).commit.sha
             new_branch_ref = repo.create_git_ref(ref="refs/heads/"+new_branch, sha=commit_sha)
+        except:
+            new_branch_ref = repo.get_git_ref(ref="heads/"+new_branch)
 
         # Get current file contents
         contents = repo.get_contents(path, ref=new_branch_ref.ref)
@@ -69,19 +94,26 @@ for repo in org.get_repos():
         updater_yml = contents.decoded_content.decode("unicode_escape")
         updater_yml = re.sub(r'(?m)uses: actions/checkout@v[\d]+', "uses: actions/checkout@v3", updater_yml)
         updater_yml = re.sub(r'(?m)uses: peter-evans/create-pull-request@v[\d]+', "uses: peter-evans/create-pull-request@v4", updater_yml)
-        updated = repo.update_file(path=contents.path,
+        updated = repo.update_file(contents.path,
-                                   message="Upgrade auto-updater",
+                                    message=title,
                                     content=updater_yml,
                                     sha=contents.sha,
-                                   branch=new_branch)
+                                    branch=new_branch,
+                                    author=author)
+
+        # Wait a bit to preserve the API rate limit
+        time.sleep(1.5)
 
         # Open the PR
         pr = repo.create_pull(title="Upgrade auto-updater", body=body, head=new_branch, base=base_branch)
 
-        print(repo.full_name+" updated with PR \#"+ pr.id)
+        print(repo.full_name+" updated with PR #"+ str(pr.id))
-        break
+        i=i+1
-    except Exception as e:
+
-        print(e)
+        # Wait a bit to preserve the API rate limit
-        print("...failed. Deleting new branch.")
+        time.sleep(1.5)
-        repo.get_git_ref("heads/"+new_branch).delete()
+
-        break
+        with open('processed.txt', 'a') as pfile:
+            pfile.write(repo.full_name+'\n')
+
+print("Done. "+str(i)+" repos processed")