chore(deps): update dependency https://github.com/serious-scaffold/ss…

…-pybind11 to v0.8.12 (#103) * chore(deps): update dependency https://github.com/serious-scaffold/ss-pybind11 to v0.8.12 * Resolve conflicts Signed-off-by: l.feng <[email protected]> --------- Signed-off-by: l.feng <[email protected]> Co-authored-by: msclock-bot[bot] <163820484+msclock-bot[bot]@users.noreply.github.com> Co-authored-by: l.feng <[email protected]>
msclock · Dec 5, 2024 · fa86f47 · fa86f47
1 parent 57a2019
commit fa86f47
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,4 +1,4 @@
-_commit: v0.8.11
+_commit: v0.8.12
 _src_path: https://github.com/serious-scaffold/ss-pybind11
 author_email: [email protected]
 author_name: l.feng

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,11 +49,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.8', '3.12']
-        runs-on: [ubuntu-22.04, macos-14, windows-2022] # renovate: github-runner
+        runs-on: [ubuntu-24.04, macos-14, windows-2022] # renovate: github-runner
 
         include:
           - python-version: pypy-3.10
-            runs-on: ubuntu-22.04 # renovate: github-runner
+            runs-on: ubuntu-24.04 # renovate: github-runner
 
     name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }}
 
@@ -136,5 +136,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,8 +2,8 @@ name: Renovate
 
 on:
   schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron: '*/15 0-3 * * 1'
+    # Match renovate schedule:earlyMondays and schedule:automergeMonthly
+    - cron: '* 0-3 * * *'
   workflow_dispatch:
 
 jobs:

diff --git a/.renovaterc.json b/.renovaterc.json
@@ -11,19 +11,25 @@
   "platformAutomerge": true,
   "packageRules": [
     {
+      "automerge": true,
+      "addLabels": [
+        "auto-approval"
+      ],
+      "extends": [
+        "schedule:earlyMondays",
+        "schedule:automergeMonthly"
+      ],
       "matchUpdateTypes": [
         "minor",
         "patch",
         "pin",
         "digest"
-      ],
-      "automerge": true
+      ]
     },
     {
       "description": "Group renovate docker tag and pre-commit-hooks tag",
       "groupName": "renovate group",
       "addLabels": [
-        "auto-approval",
         "renovate"
       ],
       "matchDatasources": [
@@ -79,12 +85,12 @@
       "versioningTemplate": "docker"
     },
     {
-      "description": "Update vcpkg.json builtin-baseline with git hash",
+      "description": "Update microsoft vcpkg baseline",
       "customType": "regex",
       "currentValueTemplate": "master",
       "datasourceTemplate": "git-refs",
       "depNameTemplate": "https://github.com/microsoft/vcpkg",
-      "depTypeTemplate": "vcpkg-builtin-baseline",
+      "depTypeTemplate": "vcpkg-baseline",
       "fileMatch": [
         "^vcpkg\\.json$"
       ],
@@ -93,11 +99,11 @@
       ]
     },
     {
-      "description": "Update registration baseline with git hash",
+      "description": "Update custom registry baseline",
       "customType": "regex",
       "currentValueTemplate": "master",
       "datasourceTemplate": "git-refs",
-      "depTypeTemplate": "registration-baseline",
+      "depTypeTemplate": "vcpkg-baseline",
       "fileMatch": [
         "^vcpkg\\.json$"
       ],