diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 85578b6..60f0d3b 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -11,10 +11,10 @@ jobs: container: env: LOG_LEVEL: debug - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find", "^apt"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^find"]' RENOVATE_BRANCH_PREFIX: renovate-github/ RENOVATE_ENABLED: ${{ vars.RENOVATE_ENABLED || true }} - RENOVATE_ENABLED_MANAGERS: '["pep621", "github-actions", "regex", "pre-commit"]' + RENOVATE_ENABLED_MANAGERS: '["pep621", "copier", "github-actions", "regex", "pre-commit"]' RENOVATE_OPTIMIZE_FOR_DISABLED: 'true' RENOVATE_PLATFORM: github RENOVATE_REPOSITORIES: '["${{ github.repository }}"]' diff --git a/.renovaterc.json b/.renovaterc.json index 260d70f..a2816f7 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -7,6 +7,7 @@ ], "automergeType": "pr", "automergeStrategy": "merge-commit", + "ignoreScripts": false, "platformAutomerge": true, "packageRules": [ { @@ -97,29 +98,6 @@ "renovate/renovate", "renovatebot/pre-commit-hooks" ] - }, - { - "commitMessageTopic": "serious-scaffold", - "matchDepTypes": [ - "ss-template" - ], - "postUpgradeTasks": { - "commands": [ - "git stash", - "apt update", - "apt install python3-pip -y", - "pip install copier==9.4.1 --break-system-packages", - "copier update --defaults --vcs-ref {{{newVersion}}}" - ] - }, - "semanticCommitScope": "ss-template" - }, - { - "description": "Group apt packages to avoid failure when multiple packages are outdated.", - "groupName": "apt packages", - "matchDepTypes": [ - "apt" - ] } ], "customManagers": [ @@ -140,7 +118,7 @@ ] }, { - "description": " Update vcpkg.json builtin-baseline with git hash", + "description": "Update vcpkg.json builtin-baseline with git hash", "customType": "regex", "currentValueTemplate": "master", "datasourceTemplate": "git-refs", @@ -165,20 +143,6 @@ "matchStrings": [ "\"baseline\": \"(?.*?)\"[^}]+?\"repository\": \"(?.*?)\"" ] - }, - { - "description": "Update ss template from serious-scaffold", - "customType": "regex", - "datasourceTemplate": "git-tags", - "depNameTemplate": "https://github.com/serious-scaffold/ss-pybind11.git", - "depTypeTemplate": "ss-template", - "fileMatch": [ - "^\\.copier-answers\\.yml$" - ], - "matchStrings": [ - "_commit: (?.*?)\n" - ], - "versioningTemplate": "semver" } ] } diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index cdca9f0..6803ef5 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -9,6 +9,7 @@ ], "automergeType": "pr", "automergeStrategy": "merge-commit", + "ignoreScripts": false, "platformAutomerge": true, "packageRules": [ { @@ -109,29 +110,6 @@ [%- endif %] "renovatebot/pre-commit-hooks" ] - }, - { - "commitMessageTopic": "serious-scaffold", - "matchDepTypes": [ - "ss-template" - ], - "postUpgradeTasks": { - "commands": [ - "git stash", - "apt update", - "apt install python3-pip -y", - "pip install copier==9.4.1 --break-system-packages", - "copier update --defaults --vcs-ref {{ '{{{newVersion}}}' }}" - ] - }, - "semanticCommitScope": "ss-template" - }, - { - "description": "Group apt packages to avoid failure when multiple packages are outdated.", - "groupName": "apt packages", - "matchDepTypes": [ - "apt" - ] } ], "customManagers": [ @@ -154,7 +132,7 @@ ] }, { - "description": " Update vcpkg.json builtin-baseline with git hash", + "description": "Update vcpkg.json builtin-baseline with git hash", "customType": "regex", "currentValueTemplate": "master", "datasourceTemplate": "git-refs", @@ -179,20 +157,6 @@ "matchStrings": [ "\"baseline\": \"(?.*?)\"[^}]+?\"repository\": \"(?.*?)\"" ] - }, - { - "description": "Update ss template from serious-scaffold", - "customType": "regex", - "datasourceTemplate": "git-tags", - "depNameTemplate": "https://github.com/serious-scaffold/ss-pybind11.git", - "depTypeTemplate": "ss-template", - "fileMatch": [ - "^\\.copier-answers\\.yml$" - ], - "matchStrings": [ - "_commit: (?.*?)\n" - ], - "versioningTemplate": "semver" } ] } 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 0ead83e..db18f5d 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 @@ -11,10 +11,10 @@ jobs: container: env: LOG_LEVEL: debug - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find", "^apt"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^find"]' RENOVATE_BRANCH_PREFIX: renovate-github/ RENOVATE_ENABLED: {{ '${{ vars.RENOVATE_ENABLED || true }}' }} - RENOVATE_ENABLED_MANAGERS: '["pep621", "github-actions", "regex", "pre-commit"]' + RENOVATE_ENABLED_MANAGERS: '["pep621", "copier", "github-actions", "regex", "pre-commit"]' RENOVATE_OPTIMIZE_FOR_DISABLED: 'true' RENOVATE_PLATFORM: github RENOVATE_REPOSITORIES: '["{{ '${{ github.repository }}' }}"]'