diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index b56531b1..77124945 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -2,7 +2,6 @@ name: Renovate on: schedule: - # * is a special character in YAML so you have to quote this string - cron: '*/15 0-3 * * 1' workflow_dispatch: @@ -11,15 +10,15 @@ jobs: container: env: LOG_LEVEL: debug - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find"]' + 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 }}"]' RENOVATE_REPOSITORY_CACHE: enabled - image: ghcr.io/renovatebot/renovate:38.110.2@sha256:06665449c11c61011319ef8f1cd6e00a265d2692e84586f964ba368d4f67591d + image: ghcr.io/renovatebot/renovate:39.42.4@sha256:c5d718e312cdacc0746e37f13c215ff498be28c51e50efd24c070ae29f5b636a options: --user root runs-on: ubuntu-22.04 steps: diff --git a/.renovaterc.json b/.renovaterc.json index f27be5e3..9f952622 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -8,6 +8,7 @@ ], "automergeType": "pr", "automergeStrategy": "merge-commit", + "ignoreScripts": false, "platformAutomerge": true, "packageRules": [ { @@ -93,27 +94,6 @@ "renovate/renovate", "renovatebot/pre-commit-hooks" ] - }, - { - "commitMessageTopic": "serious-scaffold-cpp", - "matchDepTypes": [ - "copier-template" - ], - "postUpgradeTasks": { - "commands": [ - "git stash", - "pip install copier==9.3.1", - "copier update --defaults --vcs-ref {{{newVersion}}}" - ] - }, - "semanticCommitScope": "copier-template" - }, - { - "description": "Group apt packages to avoid failure when multiple packages are outdated.", - "groupName": "apt packages", - "matchDepTypes": [ - "apt" - ] } ], "customManagers": [ @@ -159,19 +139,6 @@ "matchStrings": [ "\"baseline\": \"(?.*?)\"[^}]+?\"repository\": \"(?.*?)\"" ] - }, - { - "customType": "regex", - "datasourceTemplate": "git-tags", - "depNameTemplate": "https://github.com/serious-scaffold/ss-cpp.git", - "depTypeTemplate": "copier-template", - "fileMatch": [ - "^\\.copier-answers\\.yml$" - ], - "matchStrings": [ - "_commit: (?.*?)\n" - ], - "versioningTemplate": "semver" } ] } diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 53be4af8..8bea0565 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -10,6 +10,7 @@ ], "automergeType": "pr", "automergeStrategy": "merge-commit", + "ignoreScripts": false, "platformAutomerge": true, "packageRules": [ [%- if repo_name == 'ss-cpp' %] @@ -105,27 +106,6 @@ [%- endif %] "renovatebot/pre-commit-hooks" ] - }, - { - "commitMessageTopic": "serious-scaffold-cpp", - "matchDepTypes": [ - "copier-template" - ], - "postUpgradeTasks": { - "commands": [ - "git stash", - "pip install copier==9.3.1", - "copier update --defaults --vcs-ref {{ '{{{newVersion}}}' }}" - ] - }, - "semanticCommitScope": "copier-template" - }, - { - "description": "Group apt packages to avoid failure when multiple packages are outdated.", - "groupName": "apt packages", - "matchDepTypes": [ - "apt" - ] } ], "customManagers": [ @@ -173,19 +153,6 @@ "matchStrings": [ "\"baseline\": \"(?.*?)\"[^}]+?\"repository\": \"(?.*?)\"" ] - }, - { - "customType": "regex", - "datasourceTemplate": "git-tags", - "depNameTemplate": "https://github.com/serious-scaffold/ss-cpp.git", - "depTypeTemplate": "copier-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 aa241684..89d56fad 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,7 +2,6 @@ name: Renovate on: schedule: - # * is a special character in YAML so you have to quote this string - cron: '*/15 0-3 * * 1' workflow_dispatch: @@ -11,15 +10,15 @@ jobs: container: env: LOG_LEVEL: debug - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find"]' + 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 }}' }}"]' RENOVATE_REPOSITORY_CACHE: enabled - image: ghcr.io/renovatebot/renovate:38.110.2@sha256:06665449c11c61011319ef8f1cd6e00a265d2692e84586f964ba368d4f67591d + image: ghcr.io/renovatebot/renovate:39.42.4@sha256:c5d718e312cdacc0746e37f13c215ff498be28c51e50efd24c070ae29f5b636a options: --user root runs-on: ubuntu-22.04 steps: