Skip to content

Commit fa86f47

Browse files
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]>
1 parent 57a2019 commit fa86f47

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v0.8.11
1+
_commit: v0.8.12
22
_src_path: https://github.com/serious-scaffold/ss-pybind11
33
author_email: [email protected]
44
author_name: l.feng

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
fail-fast: false
5050
matrix:
5151
python-version: ['3.8', '3.12']
52-
runs-on: [ubuntu-22.04, macos-14, windows-2022] # renovate: github-runner
52+
runs-on: [ubuntu-24.04, macos-14, windows-2022] # renovate: github-runner
5353

5454
include:
5555
- python-version: pypy-3.10
56-
runs-on: ubuntu-22.04 # renovate: github-runner
56+
runs-on: ubuntu-24.04 # renovate: github-runner
5757

5858
name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }}
5959

@@ -136,5 +136,5 @@ jobs:
136136
jobs: ${{ toJSON(needs) }}
137137

138138
- name: Approve pr if all jobs succeeded
139-
if: contains(github.event.pull_request.labels.*.name, 'auto-approval')
139+
if: contains(github.event.pull_request.labels.*.name, 'auto-approval') && contains(github.actor, '[bot]')
140140
uses: hmarr/auto-approve-action@v4

.github/workflows/renovate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Renovate
22

33
on:
44
schedule:
5-
# * is a special character in YAML so you have to quote this string
6-
- cron: '*/15 0-3 * * 1'
5+
# Match renovate schedule:earlyMondays and schedule:automergeMonthly
6+
- cron: '* 0-3 * * *'
77
workflow_dispatch:
88

99
jobs:

.renovaterc.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,25 @@
1111
"platformAutomerge": true,
1212
"packageRules": [
1313
{
14+
"automerge": true,
15+
"addLabels": [
16+
"auto-approval"
17+
],
18+
"extends": [
19+
"schedule:earlyMondays",
20+
"schedule:automergeMonthly"
21+
],
1422
"matchUpdateTypes": [
1523
"minor",
1624
"patch",
1725
"pin",
1826
"digest"
19-
],
20-
"automerge": true
27+
]
2128
},
2229
{
2330
"description": "Group renovate docker tag and pre-commit-hooks tag",
2431
"groupName": "renovate group",
2532
"addLabels": [
26-
"auto-approval",
2733
"renovate"
2834
],
2935
"matchDatasources": [
@@ -79,12 +85,12 @@
7985
"versioningTemplate": "docker"
8086
},
8187
{
82-
"description": "Update vcpkg.json builtin-baseline with git hash",
88+
"description": "Update microsoft vcpkg baseline",
8389
"customType": "regex",
8490
"currentValueTemplate": "master",
8591
"datasourceTemplate": "git-refs",
8692
"depNameTemplate": "https://github.com/microsoft/vcpkg",
87-
"depTypeTemplate": "vcpkg-builtin-baseline",
93+
"depTypeTemplate": "vcpkg-baseline",
8894
"fileMatch": [
8995
"^vcpkg\\.json$"
9096
],
@@ -93,11 +99,11 @@
9399
]
94100
},
95101
{
96-
"description": "Update registration baseline with git hash",
102+
"description": "Update custom registry baseline",
97103
"customType": "regex",
98104
"currentValueTemplate": "master",
99105
"datasourceTemplate": "git-refs",
100-
"depTypeTemplate": "registration-baseline",
106+
"depTypeTemplate": "vcpkg-baseline",
101107
"fileMatch": [
102108
"^vcpkg\\.json$"
103109
],

0 commit comments

Comments
 (0)