From 5ce4c7d8e97fb9ba6bd3acd37f17923f0e81b8bb Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Thu, 13 Jun 2024 16:37:49 +0200 Subject: [PATCH 1/2] switch token for renovate --- .github/workflows/renovate.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 2970857f..5e2846fa 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -8,20 +8,14 @@ on: jobs: renovate: - permissions: - contents: read - issues: read - pull-requests: write - repository-projects: read - statuses: read runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4.1.6 - name: Renovate - uses: renovatebot/github-action@v40.1.12 + uses: renovatebot/github-action@v40.1.11 with: configurationFile: renovate-config.json - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PCCIBOT_PAT_REPO_PUBLIC_REPO }} env: LOG_LEVEL: 'debug' From 7da5b278935a3b2196221c7e8363dbc12134c94e Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Thu, 13 Jun 2024 18:47:47 +0200 Subject: [PATCH 2/2] update REFERENCE.md in renovate PRs --- .github/workflows/renovate.yml | 4 +++- renovate-config.json | 35 ++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 5e2846fa..5e5f5086 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -13,9 +13,11 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.6 - name: Renovate - uses: renovatebot/github-action@v40.1.11 + uses: renovatebot/github-action@v40.1.12 with: configurationFile: renovate-config.json token: ${{ secrets.PCCIBOT_PAT_REPO_PUBLIC_REPO }} + renovate-image: ghcr.io/renovatebot/renovate + renovate-version: 37-full env: LOG_LEVEL: 'debug' diff --git a/renovate-config.json b/renovate-config.json index f9eedf52..e1a13f3e 100644 --- a/renovate-config.json +++ b/renovate-config.json @@ -2,15 +2,24 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "onboarding": false, "requireConfig": "optional", - "repositories": ["voxpupuli/puppet-prometheus"], - "extends": ["config:recommended"], - "enabledManagers": ["custom.regex"], + "repositories": [ + "voxpupuli/puppet-prometheus" + ], + "extends": [ + "config:recommended" + ], + "enabledManagers": [ + "custom.regex" + ], "prHourlyLimit": 10, "prConcurrentLimit": 20, + "branchConcurrentLimit": 30, "customManagers": [ { "customType": "regex", - "fileMatch": ["defaults.yaml"], + "fileMatch": [ + "defaults.yaml" + ], "matchStrings": [ "# renovate: depName=(?[^\\s]+?)\\s+[a-z0-9:_]+?::version:\\s+['\"]?(?[\\w+\\.]*)" ], @@ -18,12 +27,26 @@ }, { "customType": "regex", - "fileMatch": [".*_exporter.pp"], + "fileMatch": [ + ".*_exporter.pp" + ], "matchStrings": [ "# renovate: depName=(?[^\\s]+?)\\s+String\\[1\\]\\s+\\$version\\s+=\\s+['\"]?(?[\\w+\\.]*)" ], "datasourceTemplate": "github-releases" } - + ], + "postUpgradeTasks": { + "commands": [ + "bundle install", + "bundle exec gem install rake", + "bundle exec rake strings:generate:reference" + ], + "executionMode": "branch" + }, + "allowedPostUpgradeCommands": [ + "^bundle install$", + "^bundle exec gem install rake$", + "^bundle exec rake strings:generate:reference$" ] }