From 49c093a3e0dc575cd744878cc0403f489cd033f0 Mon Sep 17 00:00:00 2001 From: "l.feng" <43399351+msclock@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:36:44 +0800 Subject: [PATCH] fix: renovate post upgrade task needs pip (#26) * Update to ss-template --------- Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> --- .github/workflows/renovate.yml | 2 +- .renovaterc.json | 7 ++++--- template/.renovaterc.json.jinja | 7 ++++--- .../workflows/renovate.yml.jinja | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 10b1e2c..85578b6 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -11,7 +11,7 @@ jobs: container: env: LOG_LEVEL: debug - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find", "^apt"]' RENOVATE_BRANCH_PREFIX: renovate-github/ RENOVATE_ENABLED: ${{ vars.RENOVATE_ENABLED || true }} RENOVATE_ENABLED_MANAGERS: '["pep621", "github-actions", "regex", "pre-commit"]' diff --git a/.renovaterc.json b/.renovaterc.json index bdc5c4d..e4fc7db 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -101,16 +101,17 @@ { "commitMessageTopic": "serious-scaffold", "matchDepTypes": [ - "copier-template" + "ss-template" ], "postUpgradeTasks": { "commands": [ + "apt update && apt install python3-pip -y", "git stash", "pip install copier==9.4.1", "copier update --defaults --vcs-ref {{{newVersion}}}" ] }, - "semanticCommitScope": "copier-template" + "semanticCommitScope": "ss-template" }, { "description": "Group apt packages to avoid failure when multiple packages are outdated.", @@ -169,7 +170,7 @@ "customType": "regex", "datasourceTemplate": "git-tags", "depNameTemplate": "https://github.com/serious-scaffold/ss-pybind11.git", - "depTypeTemplate": "copier-template", + "depTypeTemplate": "ss-template", "fileMatch": [ "^\\.copier-answers\\.yml$" ], diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 207d4f5..784dc29 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -113,16 +113,17 @@ { "commitMessageTopic": "serious-scaffold", "matchDepTypes": [ - "copier-template" + "ss-template" ], "postUpgradeTasks": { "commands": [ + "apt update && apt install python3-pip -y", "git stash", "pip install copier==9.4.1", "copier update --defaults --vcs-ref {{ '{{{newVersion}}}' }}" ] }, - "semanticCommitScope": "copier-template" + "semanticCommitScope": "ss-template" }, { "description": "Group apt packages to avoid failure when multiple packages are outdated.", @@ -183,7 +184,7 @@ "customType": "regex", "datasourceTemplate": "git-tags", "depNameTemplate": "https://github.com/serious-scaffold/ss-pybind11.git", - "depTypeTemplate": "copier-template", + "depTypeTemplate": "ss-template", "fileMatch": [ "^\\.copier-answers\\.yml$" ], 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 4deb923..0ead83e 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,7 +11,7 @@ jobs: container: env: LOG_LEVEL: debug - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^git", "^pip", "^copier", "^find", "^apt"]' RENOVATE_BRANCH_PREFIX: renovate-github/ RENOVATE_ENABLED: {{ '${{ vars.RENOVATE_ENABLED || true }}' }} RENOVATE_ENABLED_MANAGERS: '["pep621", "github-actions", "regex", "pre-commit"]'