diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 527b15ec..f78ee1f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,5 +202,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 index 1c453de2..2007af0e 100644 --- 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 index dd89a2be..c784bf85 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -11,13 +11,20 @@ "platformAutomerge": true, "packageRules": [ { + "automerge": true, + "addLabels": [ + "auto-approval" + ], + "extends": [ + "schedule:earlyMondays", + "schedule:automergeMonthly" + ], "matchUpdateTypes": [ "minor", "patch", "pin", "digest" - ], - "automerge": true + ] }, { "matchDepTypes": [ @@ -76,7 +83,6 @@ "description": "Group renovate docker tag and pre-commit-hooks tag", "groupName": "renovate group", "addLabels": [ - "auto-approval", "renovate" ], "matchDatasources": [ diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 9d810596..4252cca8 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -13,13 +13,20 @@ "platformAutomerge": true, "packageRules": [ { + "automerge": true, + "addLabels": [ + "auto-approval" + ], + "extends": [ + "schedule:earlyMondays", + "schedule:automergeMonthly" + ], "matchUpdateTypes": [ "minor", "patch", "pin", "digest" - ], - "automerge": true + ] }, [%- if repo_name == 'ss-pybind11' %] { @@ -80,9 +87,6 @@ "description": "Group renovate docker tag and pre-commit-hooks tag", "groupName": "renovate group", "addLabels": [ -[%- if repo_platform == 'github' %] - "auto-approval", -[%- endif %] "renovate" ], "matchDatasources": [ 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 index ab55b020..d724d0c4 100644 --- a/template/[% if repo_platform == 'github' %].github[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_platform == 'github' %].github[% endif %]/workflows/ci.yml.jinja @@ -212,5 +212,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 index 69809a79..c1a8b179 100644 --- 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,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: