From 5a1fc7d9a86f1071a6414a6f470603c0bdf5cd7e Mon Sep 17 00:00:00 2001
From: Davide Marchegiani <davide.marchegiani@gmail.com>
Date: Mon, 26 Aug 2024 16:29:03 +1000
Subject: [PATCH 1/2] Changed automatic_merge workflow to use access-bot
 (signed commits) and happen every Monday at 3:09am (AEDT)

---
 .github/workflows/automatic_merge.yml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/automatic_merge.yml b/.github/workflows/automatic_merge.yml
index 2bfc9f544..e8067e246 100644
--- a/.github/workflows/automatic_merge.yml
+++ b/.github/workflows/automatic_merge.yml
@@ -2,25 +2,36 @@ name: Automatic merge
 
 on:
   schedule: 
-    # Run every Sunday at 03:09 (AEDT)
-    # AEDT is UTC+10 --> Sunday at 03:09 AEDT is Saturday at 17:09 UTC
-    - cron: "9 17 * * SAT"
+    # Run every Monday at 03:09 (AEDT)
+    # AEDT is UTC+10 --> Monday at 03:09 AEDT is Sunday at 17:09 UTC
+    - cron: "9 17 * * SUN"
 
 jobs:
   auto-merge:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
     - name: Checkout repo
-      uses: actions/checkout@master
+      uses: actions/checkout@v4
       with:
-        ref: main
+        ref: main 
         fetch-depth: 0
-        token: ${{ secrets.ADMIN_TOKEN }}
+    
+    - name: Import GPG settings
+      uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4  # v6.1.0
+      with:
+        gpg_private_key: ${{ secrets.GH_ACTIONS_BOT_GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.GH_ACTIONS_BOT_GPG_PASSPHRASE }}
+        git_config_global: true
+        git_committer_name: ${{ vars.GH_ACTIONS_BOT_GIT_USER_NAME }}
+        git_committer_email: ${{ vars.GH_ACTIONS_BOT_GIT_USER_EMAIL }}
+        git_user_signingkey: true
+        git_commit_gpgsign: true
+        git_tag_gpgsign: true
     
     - name: Merge development to main
       run: |
-        git config --global user.name "GitHub Actions"
-        git config --global user.email "github-actions@github.com"
         git merge --no-ff -X theirs origin/development -m "Automatically merge 'development' to 'main'.
         Merge commit issued by the automatic_merge workflow."
         git push origin main

From 61935a8bf9b310e40ef08768fa1b149ce949e013 Mon Sep 17 00:00:00 2001
From: Davide Marchegiani <davide.marchegiani@gmail.com>
Date: Wed, 4 Sep 2024 15:13:56 +1000
Subject: [PATCH 2/2] Changed scheduled check-links workflow to happen every
 Monday at 3.07am

---
 .github/workflows/check_links.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check_links.yml b/.github/workflows/check_links.yml
index 315283e47..8fcbd680f 100644
--- a/.github/workflows/check_links.yml
+++ b/.github/workflows/check_links.yml
@@ -7,9 +7,9 @@ on:
       - reopened
       - synchronize
   schedule: 
-    # Run every Sunday at 03:07 (AEDT)
-    # AEDT is UTC+10 --> Sunday at 03:07 AEDT is Saturday at 17:07 UTC
-    - cron: "7 17 * * SAT"
+    # Run every Monday at 03:07 (AEDT)
+    # AEDT is UTC+10 --> Monday at 03:07 AEDT is Sunday at 17:07 UTC
+    - cron: "7 17 * * SUN"
   workflow_dispatch:
 
 jobs: