perf: refine automerge strategy (#404)

Signed-off-by: l.feng <[email protected]>
serious-scaffold · Dec 8, 2024 · ccfd649 · ccfd649
1 parent 0ef672e
commit ccfd649
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -975,5 +975,5 @@ jobs:
           jobs: ${{ toJSON(needs) }}
 
       - name: Approve pr if all jobs succeeded
-        if: contains(github.event.pull_request.labels.*.name, 'auto-approval')
+        if: contains(github.event.pull_request.labels.*.name, 'auto-approval') && contains(github.actor, '[bot]')
         uses: hmarr/auto-approve-action@v4
diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
@@ -2,7 +2,8 @@ name: Renovate
 
 on:
   schedule:
-    - cron: '*/15 0-3 * * 1'
+    # Match renovate schedule:earlyMondays and schedule:automergeMonthly
+    - cron: '*/15 0-3 * * *'
   workflow_dispatch:
 
 jobs:

diff --git a/.renovaterc.json b/.renovaterc.json
@@ -3,14 +3,29 @@
   "extends": [
     "config:recommended",
     "helpers:pinGitHubActionDigests",
-    ":enablePreCommit",
-    ":maintainLockFilesWeekly"
+    ":enablePreCommit"
   ],
   "automergeType": "pr",
   "automergeStrategy": "merge-commit",
   "ignoreScripts": false,
   "platformAutomerge": true,
   "packageRules": [
+    {
+      "automerge": true,
+      "addLabels": [
+        "auto-approval"
+      ],
+      "extends": [
+        "schedule:earlyMondays",
+        "schedule:automergeMonthly"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "pin",
+        "digest"
+      ]
+    },
     {
       "matchDepTypes": [
         "action"
@@ -57,7 +72,6 @@
     {
       "description": "Group vcpkg.json baseline with auto-update",
       "groupName": "group vcpkg-baseline",
-      "extends": ["schedule:automergeMonthly"],
       "addLabels": [
         "auto-approval",
         "vcpkg-baseline"
@@ -69,7 +83,6 @@
       "matchFileNames": [
         "vcpkg.json"
       ],
-      "automerge": true,
       "postUpgradeTasks": {
         "commands": [
           "find template -type f -name 'vcpkg.json.jinja' -exec sed -i 's|{{{currentDigest}}}|{{{newDigest}}}|g' {} +"
@@ -79,16 +92,13 @@
     {
       "description": "Group renovate docker tag and pre-commit-hooks tag",
       "groupName": "renovate group",
-      "extends": ["schedule:automergeMonthly"],
       "addLabels": [
-        "auto-approval",
         "renovate"
       ],
       "matchDatasources": [
         "docker",
         "github-tags"
       ],
-      "automerge": true,
       "matchDepNames": [
         "ghcr.io/renovatebot/renovate",
         "renovate/renovate",

diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja
@@ -5,14 +5,29 @@
 [%- if repo_name == 'ss-cpp' or repo_platform == 'github' %]
     "helpers:pinGitHubActionDigests",
 [%- endif %]
-    ":enablePreCommit",
-    ":maintainLockFilesWeekly"
+    ":enablePreCommit"
   ],
   "automergeType": "pr",
   "automergeStrategy": "merge-commit",
   "ignoreScripts": false,
   "platformAutomerge": true,
   "packageRules": [
+    {
+      "automerge": true,
+      "addLabels": [
+        "auto-approval"
+      ],
+      "extends": [
+        "schedule:earlyMondays",
+        "schedule:automergeMonthly"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "pin",
+        "digest"
+      ]
+    },
 [%- if repo_name == 'ss-cpp' %]
     {
       "matchDepTypes": [
@@ -60,7 +75,6 @@
     {
       "description": "Group vcpkg.json baseline with auto-update",
       "groupName": "group vcpkg-baseline",
-      "extends": ["schedule:automergeMonthly"],
       "addLabels": [
 [%- if repo_platform == 'github' %]
         "auto-approval",
@@ -74,7 +88,6 @@
       "matchFileNames": [
         "vcpkg.json"
       ],
-      "automerge": true,
       "postUpgradeTasks": {
         "commands": [
           "find template -type f -name 'vcpkg.json.jinja' -exec sed -i {{ '\'s|{{{currentDigest}}}|{{{newDigest}}}|g\'' }} {} +"
@@ -85,18 +98,13 @@
     {
       "description": "Group renovate docker tag and pre-commit-hooks tag",
       "groupName": "renovate group",
-      "extends": ["schedule:automergeMonthly"],
       "addLabels": [
-[%- if repo_platform == 'github' %]
-        "auto-approval",
-[%- endif %]
         "renovate"
       ],
       "matchDatasources": [
         "docker",
         "github-tags"
       ],
-      "automerge": true,
       "matchDepNames": [
 [%- if repo_platform == 'github' %]
         "ghcr.io/renovatebot/renovate",

diff --git a/template/[% if repo_platform == 'github' %].github[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_platform == 'github' %].github[% endif %]/workflows/ci.yml.jinja
@@ -1023,5 +1023,5 @@ jobs:
           jobs: {{ '${{ toJSON(needs) }}' }}
 
       - name: Approve pr if all jobs succeeded
-        if: contains(github.event.pull_request.labels.*.name, 'auto-approval')
+        if: contains(github.event.pull_request.labels.*.name, 'auto-approval') && contains(github.actor, '[bot]')
         uses: hmarr/auto-approve-action@v4
diff --git a/template/[% if repo_platform == 'github' %].github[% endif %]/workflows/renovate.yml.jinja b/template/[% if repo_platform == 'github' %].github[% endif %]/workflows/renovate.yml.jinja
@@ -2,7 +2,8 @@ name: Renovate
 
 on:
   schedule:
-    - cron: '*/15 0-3 * * 1'
+    # Match renovate schedule:earlyMondays and schedule:automergeMonthly
+    - cron: '*/15 0-3 * * *'
   workflow_dispatch:
 
 jobs: