diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 5acfedc12..5d4116cf5 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -89,12 +89,9 @@ matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'], enabled: false, }, - /** Update dpkg versions at any time */ + /** Auto merge the GitHub action and pre-commit updates */ { - matchBaseBranches: ['/^[0-9]+\\.[0-9]+$/'], - matchPaths: ['^ci/dpkg\\-versions\\.yaml$'], - schedule: ['at any time'], - groupName: 'dpkg', + matchDatasources: ['github-actions', 'pre-commit'], automerge: true, }, ], @@ -104,13 +101,6 @@ fileMatch: ['^\\.pre\\-commit\\-config\\.yaml$'], matchStrings: [" +- '?(?[^' @=]+)(@|==)(?[^' @=]+)'? # (?.+)"], }, - /** Do update on packages update (trigger a rebuild) */ - { - fileMatch: ['^ci/dpkg\\-versions\\.yaml$'], - matchStrings: [" *(?[^'\\s]+): '?(?[^'\\s/]*[0-9][^'\\s/]*)'?"], - datasourceTemplate: 'repology', - versioningTemplate: 'loose', - }, /** Do update on the schema present in the ci/config.yaml */ { fileMatch: ['^ci/config\\.yaml$'], diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index ea959e8ee..d0cc8dbfc 100644 --- a/.github/workflows/backport.yaml +++ b/.github/workflows/backport.yaml @@ -11,8 +11,8 @@ env: jobs: backport: - runs-on: ubuntu-22.04 name: Backport + runs-on: ubuntu-22.04 timeout-minutes: 5 steps: diff --git a/.github/workflows/dependency-auto-review.yaml b/.github/workflows/dependency-auto-review.yaml index d09719021..f3dc71646 100644 --- a/.github/workflows/dependency-auto-review.yaml +++ b/.github/workflows/dependency-auto-review.yaml @@ -11,9 +11,10 @@ jobs: name: Auto reviews updates runs-on: ubuntu-22.04 timeout-minutes: 5 + if: github.event.pull_request.user.login == 'renovate[bot]' steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: script: |- github.rest.pulls.createReview({ @@ -22,4 +23,3 @@ jobs: pull_number: context.payload.pull_request.number, event: 'APPROVE', }) - if: github.event.pull_request.user.login == 'renovate[bot]' diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 61d72776f..0cf0c9aa9 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,8 +13,8 @@ env: jobs: main: - runs-on: ubuntu-22.04 name: Continuous integration + runs-on: ubuntu-22.04 timeout-minutes: 20 steps: diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml index 2d54a31c1..608bf214f 100644 --- a/.github/workflows/rebuild.yaml +++ b/.github/workflows/rebuild.yaml @@ -14,8 +14,8 @@ env: jobs: rebuild: - runs-on: ubuntu-22.04 name: Rebuild + runs-on: ubuntu-22.04 timeout-minutes: 10 strategy: