Skip to content

Commit

Permalink
Merge pull request #1162 from camptocamp/c2cciutils-upgrade
Browse files Browse the repository at this point in the history
CI updates
  • Loading branch information
sbrunner authored Nov 28, 2023
2 parents 71d916e + 3a7c015 commit d627543
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 17 deletions.
14 changes: 2 additions & 12 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
],
Expand All @@ -104,13 +101,6 @@
fileMatch: ['^\\.pre\\-commit\\-config\\.yaml$'],
matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
},
/** Do update on packages update (trigger a rebuild) */
{
fileMatch: ['^ci/dpkg\\-versions\\.yaml$'],
matchStrings: [" *(?<depName>[^'\\s]+): '?(?<currentValue>[^'\\s/]*[0-9][^'\\s/]*)'?"],
datasourceTemplate: 'repology',
versioningTemplate: 'loose',
},
/** Do update on the schema present in the ci/config.yaml */
{
fileMatch: ['^ci/config\\.yaml$'],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:

jobs:
backport:
runs-on: ubuntu-22.04
name: Backport
runs-on: ubuntu-22.04
timeout-minutes: 5

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependency-auto-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -22,4 +23,3 @@ jobs:
pull_number: context.payload.pull_request.number,
event: 'APPROVE',
})
if: github.event.pull_request.user.login == 'renovate[bot]'
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ env:

jobs:
main:
runs-on: ubuntu-22.04
name: Continuous integration
runs-on: ubuntu-22.04
timeout-minutes: 20

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ env:

jobs:
rebuild:
runs-on: ubuntu-22.04
name: Rebuild
runs-on: ubuntu-22.04
timeout-minutes: 10

strategy:
Expand Down

0 comments on commit d627543

Please sign in to comment.