From de52f744804b93564f6f0e922d3e0ea59086a56b Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Fri, 29 Mar 2024 15:34:10 +0100 Subject: [PATCH] feat: group GitHub action updates into one PR and update to new workflow (#76) # Description - updates to the new workflow schema - groups GitHub action updates into one PR as all uses the same digest and are always updated together # Checklist - [x] My code follows the style guidelines of the project - [x] I have performed a self-review of my own code - [x] I have made corresponding changes to the documentation --- .config/cspell.json | 4 +- .config/yamllint.yml | 2 + CODEOWNERS => .github/CODEOWNERS | 2 +- CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 .github/renovate.json5 | 4 + .github/workflows/linter.yml | 118 +----------------- .github/workflows/pull-request.yml | 50 -------- .github/workflows/pull_request.yml | 18 +++ .github/workflows/release.yml | 22 +--- .github/workflows/release_dry_run.yml | 14 +++ .github/workflows/renovate-auto-approve.yml | 17 --- .github/workflows/renovate_auto_approve.yml | 11 ++ .github/workflows/slash-ops-command-help.yml | 37 ------ .../workflows/slash-ops-comment-dispatch.yml | 22 ---- .github/workflows/slash_ops_command_help.yml | 14 +++ .../workflows/slash_ops_comment_dispatch.yml | 14 +++ .github/workflows/spelling.yml | 13 +- .github/workflows/stale.yml | 19 +-- .github/workflows/welcome-message.yml | 28 ----- .github/workflows/welcome_message.yml | 14 +++ CHANGELOG.md | 47 ------- default.json | 24 +++- renovate.json | 3 - 23 files changed, 129 insertions(+), 368 deletions(-) rename CODEOWNERS => .github/CODEOWNERS (74%) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) create mode 100644 .github/renovate.json5 delete mode 100644 .github/workflows/pull-request.yml create mode 100644 .github/workflows/pull_request.yml create mode 100644 .github/workflows/release_dry_run.yml delete mode 100644 .github/workflows/renovate-auto-approve.yml create mode 100644 .github/workflows/renovate_auto_approve.yml delete mode 100644 .github/workflows/slash-ops-command-help.yml delete mode 100644 .github/workflows/slash-ops-comment-dispatch.yml create mode 100644 .github/workflows/slash_ops_command_help.yml create mode 100644 .github/workflows/slash_ops_comment_dispatch.yml delete mode 100644 .github/workflows/welcome-message.yml create mode 100644 .github/workflows/welcome_message.yml delete mode 100644 CHANGELOG.md delete mode 100644 renovate.json diff --git a/.config/cspell.json b/.config/cspell.json index 2f3237d..c08d44e 100644 --- a/.config/cspell.json +++ b/.config/cspell.json @@ -15,9 +15,10 @@ "amannn", "autodiscover", "automerge", + "automerged", "codeowners", "codeql", - "conventionalcommits", + "conventionalcommits", "datasource", "datasources", "Dockerfiles", @@ -28,6 +29,7 @@ "ludeeus", "markdownlint", "mktemp", + "pascalfrenz", "renovatebot", "rhysd", "ruleset", diff --git a/.config/yamllint.yml b/.config/yamllint.yml index ac95fe9..25e3962 100644 --- a/.config/yamllint.yml +++ b/.config/yamllint.yml @@ -4,3 +4,5 @@ extends: default rules: line-length: max: 132 + comments: + min-spaces-from-content: 1 # Renovate uses 1 space only diff --git a/CODEOWNERS b/.github/CODEOWNERS similarity index 74% rename from CODEOWNERS rename to .github/CODEOWNERS index 9208723..a1a92c6 100644 --- a/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,4 @@ -* @kayman-mk +* @kayman-mk @pascalfrenz # license file shouldn't be changed and needs to be reviewed by lawyers LICENSE @kayman-mk diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 0000000..c371f1c --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,4 @@ +{ + $schema: "https://docs.renovatebot.com/renovate-schema.json", + extends: ["github>Hapag-Lloyd/Renovate-Global-Configuration"] +} diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 0a381cd..9cb4896 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -6,122 +6,16 @@ on: pull_request: jobs: - find-changes: - runs-on: ubuntu-latest - steps: - # yamllint disable-line rule:comments - - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 - id: changes - with: - filters: | - json: - - '**/*.json' - - markdown: - - '**/*.md' - - renovate-config: - - 'renovate.json' - - 'default.json' - - workflow: - - '.github/workflows/*.yml' - - '.github/workflows/*.yaml' - - yaml: - - '**/*.yaml' - - '**/*.yml' - outputs: - json: ${{ steps.changes.outputs.json }} - markdown: ${{ steps.changes.outputs.markdown }} - renovate-config: ${{ steps.changes.outputs.renovate-config }} - workflow: ${{ steps.changes.outputs.workflow }} - yaml: ${{ steps.changes.outputs.yaml }} - - lint-json: - runs-on: ubuntu-latest - continue-on-error: true - if: needs.find-changes.outputs.json == 'true' - needs: find-changes - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - - name: Run JSON Lint - run: bash <(curl -s https://raw.githubusercontent.com/CICDToolbox/json-lint/master/pipeline.sh) + default: + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_linter_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit - lint-markdown: + lint-renovate-defaults: runs-on: ubuntu-latest - continue-on-error: true - if: needs.find-changes.outputs.markdown == 'true' - needs: find-changes steps: - # yamllint disable-line rule:comments - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - name: Validate Markdown file - run: | - npm install -g markdownlint-cli - markdownlint -c .config/markdownlint.yml -i CHANGELOG.md "**/*.md" - - lint-renovate: - runs-on: ubuntu-latest - continue-on-error: true - if: needs.find-changes.outputs.renovate-config == 'true' - needs: find-changes - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - # yamllint disable-line rule:comments + # a special check for the defaults - uses: suzuki-shunsuke/github-action-renovate-config-validator@b54483862375f51910a60c4f498e927d4f3df466 # v1.0.1 - - # validates the default configuration included by all projects - # yamllint disable-line rule:comments - - uses: suzuki-shunsuke/github-action-renovate-config-validator@b54483862375f51910a60c4f498e927d4f3df466 # v1.0.1 - with: - config_file_path: default.json - - lint-shell: - name: Check shell scripts - runs-on: ubuntu-latest - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - - name: ShellCheck - # yamllint disable-line rule:comments - uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0 - - lint-workflow: - runs-on: ubuntu-latest - continue-on-error: true - needs: find-changes - if: needs.find-changes.outputs.workflow == 'true' - container: - image: rhysd/actionlint:1.6.27@sha256:d84eca815fc24f72546ec1f2f416d9500ad3349ce7db098cf7a52256f5fd4384 - options: --cpus 1 --user root - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - - name: Validate Github workflows - run: | - mkdir .git - actionlint -color - - lint-yaml: - runs-on: ubuntu-latest - continue-on-error: true - needs: find-changes - if: needs.find-changes.outputs.yaml == 'true' - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - - name: yaml-lint - # yamllint disable-line rule:comments - uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # v3.1.1 with: - config_file: .config/yamllint.yml - strict: true + config_file_path: "default.json" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml deleted file mode 100644 index 714501b..0000000 --- a/.github/workflows/pull-request.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -name: "Pull Request" - -# yamllint disable-line rule:truthy -on: - pull_request_target: - types: - - opened - - edited - - synchronize - branches-ignore: - - "release-please--branches--*" - -jobs: - main: - name: Validate PR title - runs-on: ubuntu-latest - steps: - # yamllint disable-line rule:comments - - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - types: | - build - chore - ci - docs - feat - fix - perf - refactor - revert - style - test - # Configure which scopes are allowed. - # deps - dependency updates - # main - for release-please (scope used for releases) - scopes: | - deps - main - requireScope: false - subjectPattern: ^(?![A-Z]).+$ - subjectPatternError: | - The subject "{subject}" found in the pull request title "{title}" - didn't match the configured pattern. Please ensure that the subject - doesn't start with an uppercase character. - wip: true - validateSingleCommit: false - validateSingleCommitMatchesPrTitle: false diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..fbb396e --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,18 @@ +--- +name: "Pull Request" + +# yamllint disable-line rule:truthy +on: + pull_request_target: + types: + - opened + - edited + - synchronize + branches-ignore: + - "release-please--branches--*" + +jobs: + default: + # yamllint disable-line rule:line-length + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_pull_request_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f62987..f0a3e16 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,22 +8,6 @@ on: - main jobs: - release: - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - steps: - - uses: actions/create-github-app-token@e8e39f73bb84fdf315a015fa3104f314c0a258b4 # v1 - id: app-token - with: - app-id: ${{ vars.GET_TOKEN_APP_ID }} - private-key: ${{ secrets.GET_TOKEN_APP_PRIVATE_KEY }} - # bootstrap-sha and release-as needs to be removed after first release - - name: Release - # yamllint disable-line rule:line-length - uses: google-github-actions/release-please-action@a2d8d683f209466ee8c695cd994ae2cf08b1642d # ratchet:google-github-actions/release-please-action@v3 - with: - release-type: python - token: ${{ steps.app-token.outputs.token }} - pull-request-header: '' + default: + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_release_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/release_dry_run.yml b/.github/workflows/release_dry_run.yml new file mode 100644 index 0000000..25495ac --- /dev/null +++ b/.github/workflows/release_dry_run.yml @@ -0,0 +1,14 @@ +--- +name: Try a release + +# yamllint disable-line rule:truthy +on: + push: + branches: + - release-dry-run + +jobs: + default: + # yamllint disable-line rule:line-length + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_release_dry_run_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/renovate-auto-approve.yml b/.github/workflows/renovate-auto-approve.yml deleted file mode 100644 index de2d116..0000000 --- a/.github/workflows/renovate-auto-approve.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: Approve all Renovate PRs automatically - -# yamllint disable-line rule:truthy -on: pull_request_target - -jobs: - auto-approve: - runs-on: ubuntu-latest - permissions: - pull-requests: write - if: github.actor == 'renovate[bot]' - steps: - - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 - with: - review-message: "Auto approved Renovate PR by organization" - github-token: ${{ secrets.PAT_FOR_PR_AUTO_APPROVAL }} diff --git a/.github/workflows/renovate_auto_approve.yml b/.github/workflows/renovate_auto_approve.yml new file mode 100644 index 0000000..9398ecb --- /dev/null +++ b/.github/workflows/renovate_auto_approve.yml @@ -0,0 +1,11 @@ +--- +name: Approve all Renovate PRs automatically + +# yamllint disable-line rule:truthy +on: pull_request_target + +jobs: + default: + # yamllint disable-line rule:line-length + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_renovate_auto_approve_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/slash-ops-command-help.yml b/.github/workflows/slash-ops-command-help.yml deleted file mode 100644 index 76a2d5e..0000000 --- a/.github/workflows/slash-ops-command-help.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -name: Execute ChatOps command - -# yamllint disable-line rule:truthy -on: - repository_dispatch: - types: - - help-command - -jobs: - help-command: - name: "ChatOps: /help" - runs-on: ubuntu-latest - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - - name: Choose maintainer - id: vars - run: | - maintainer=$(grep -oE "@[a-zA-Z0-9_-]+" CODEOWNERS | shuf -n 1) - echo "maintainer=$maintainer" >> "$GITHUB_OUTPUT" - - - name: Create comment - # yamllint disable-line rule:comments - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 - with: - # yamllint disable rule:line-length - script: | - // adds a comment to the PR (there is the issue API, which works work PRs too) - github.rest.issues.createComment({ - issue_number: context.payload.client_payload.github.payload.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: 'Hey there ${{ steps.vars.outputs.maintainer }}, could you please help @${{ github.event.client_payload.github.payload.comment.user.login }} out?' - }) - # yamllint enable rule:line-length diff --git a/.github/workflows/slash-ops-comment-dispatch.yml b/.github/workflows/slash-ops-comment-dispatch.yml deleted file mode 100644 index 80533eb..0000000 --- a/.github/workflows/slash-ops-comment-dispatch.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: PR commented - -# yamllint disable-line rule:truthy -on: - issue_comment: - types: - - created - -jobs: - slash-command-dispatch: - runs-on: ubuntu-latest - steps: - - name: Slash Command Dispatch - # yamllint disable-line rule:comments - uses: peter-evans/slash-command-dispatch@13bc09769d122a64f75aa5037256f6f2d78be8c4 # v4.0.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} - issue-type: pull-request - reactions: true - commands: | - help diff --git a/.github/workflows/slash_ops_command_help.yml b/.github/workflows/slash_ops_command_help.yml new file mode 100644 index 0000000..4eb30db --- /dev/null +++ b/.github/workflows/slash_ops_command_help.yml @@ -0,0 +1,14 @@ +--- +name: Execute ChatOps command + +# yamllint disable-line rule:truthy +on: + repository_dispatch: + types: + - help-command + +jobs: + default: + # yamllint disable-line rule:line-length + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_slash_ops_command_help_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/slash_ops_comment_dispatch.yml b/.github/workflows/slash_ops_comment_dispatch.yml new file mode 100644 index 0000000..a9d61e7 --- /dev/null +++ b/.github/workflows/slash_ops_comment_dispatch.yml @@ -0,0 +1,14 @@ +--- +name: PR commented + +# yamllint disable-line rule:truthy +on: + issue_comment: + types: + - created + +jobs: + default: + # yamllint disable-line rule:line-length + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_slash_ops_comment_dispatch_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 5b5d0bf..69ca8cb 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -6,13 +6,6 @@ on: pull_request: jobs: - cspell: - runs-on: ubuntu-latest - steps: - # yamllint disable-line rule:comments - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - # yamllint disable-line rule:comments - - uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c # v6.1.0 - with: - config: .config/cspell.json + default: + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_spelling_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 385b35a..330f55c 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,19 +7,6 @@ on: - cron: "25 2 * * *" jobs: - stale: - runs-on: ubuntu-latest - steps: - # yamllint disable-line rule:comments - - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0 - with: - # yamllint disable rule:line-length - stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 10 days." - stale-pr-message: "This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 10 days." - close-issue-message: "This issue was closed because it has been stalled for 10 days with no activity." - close-pr-message: "This PR was closed because it has been stalled for 10 days with no activity." - # yamllint enable rule:line-length - days-before-stale: 30 - days-before-close: 10 - stale-issue-label: "stale" - stale-pr-label: "stale" + default: + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_stale_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/.github/workflows/welcome-message.yml b/.github/workflows/welcome-message.yml deleted file mode 100644 index 189371e..0000000 --- a/.github/workflows/welcome-message.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: PR opened - -# yamllint disable-line rule:truthy -on: - pull_request_target: - types: - - opened - -jobs: - add-welcome-message: - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - # yamllint disable-line rule:comments - - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 - with: - # yamllint disable rule:line-length - script: | - // adds a comment to the PR (there is the issue API only which works work PRs too) - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: 'Hey @${{ github.event.pull_request.user.login }}! 👋\n\nThank you for your contribution to the project. Please refer to the [contribution rules](../blob/main/CONTRIBUTING.md) for a quick overview of the process.\n\nMake sure that this PR clearly explains:\n\n- the problem being solved\n- the best way a reviewer and you can test your changes\n\nWith submitting this PR you confirm that you hold the rights of the code added and agree that it will published under this [LICENSE](../blob/main/LICENSE).\n\nThe following ChatOps commands are supported:\n- `/help`: notifies a maintainer to help you out\n\nSimply add a comment with the command in the first line. If you need to pass more information, separate it with a blank line from the command.\n\n_This message was generated automatically. You are welcome to [improve it](../blob/main/.github/workflows/welcome-message.yml)._' - }) - # yamllint enable rule:line-length diff --git a/.github/workflows/welcome_message.yml b/.github/workflows/welcome_message.yml new file mode 100644 index 0000000..25a8ad2 --- /dev/null +++ b/.github/workflows/welcome_message.yml @@ -0,0 +1,14 @@ +--- +name: PR opened + +# yamllint disable-line rule:truthy +on: + pull_request_target: + types: + - opened + +jobs: + default: + # yamllint disable-line rule:line-length + uses: Hapag-Lloyd/Repository-Templates/.github/workflows/default_welcome_message_callable.yml@e87de55f19cc1e069426c42120094e7e2446dad4 + secrets: inherit diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index b0024e5..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,47 +0,0 @@ -# Changelog - -## [1.3.1](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/compare/v1.3.0...v1.3.1) (2023-02-13) - - -### Bug Fixes - -* use `GITHUB_TOKEN` for Renovate ([#31](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/31)) ([c6650aa](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/c6650aa02dca881da38713da46711a19ed78874f)) -* use Renovate as git author ([#29](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/29)) ([c453b50](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/c453b50d884e63ee08aa0aadb41f6df772b7cf2f)) - - -### Reverts - -* use `GITHUB_TOKEN` for Renovate ([#32](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/32)) ([ebd8d5a](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/ebd8d5a01db02027142df583988fe365dcf86ebc)) - -## [1.3.0](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/compare/v1.2.0...v1.3.0) (2023-02-12) - - -### Features - -* enable Renovate dependency dashboard ([#23](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/23)) ([f5d5f09](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/f5d5f09e7197c25776d9b8be01108f78844054a4)) - - -### Bug Fixes - -* use dedicated prefixes for dependency updates ([#25](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/25)) ([1415eb5](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/1415eb5143df74ddb50fcb35f05eb97b95536baf)) - -## [1.2.0](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/compare/v1.1.0...v1.2.0) (2023-02-10) - - -### Features - -* allow Renovate to update versions in `tflint.hcl` and `terraform.yml` ([#14](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/14)) ([bf41060](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/bf4106091646ec09cfa22c27c28b7fa2ed7f9a31)) - -## [1.1.0](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/compare/v1.0.0...v1.1.0) (2023-02-10) - - -### Features - -* pin all GitHub actions to a digest ([#11](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/11)) ([efc6901](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/efc6901b910401d5330ab95223fba17e56dcf119)) - -## 1.0.0 (2023-02-09) - - -### Features - -* setup default Renovate configuration ([#1](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/issues/1)) ([d45f528](https://github.com/Hapag-Lloyd/Renovate-Global-Configuration/commit/d45f528c40c2d830d82d00997c52decc92150f8e)) diff --git a/default.json b/default.json index 8f26c9e..0a21352 100644 --- a/default.json +++ b/default.json @@ -1,9 +1,14 @@ { "autodiscover": true, "autodiscoverFilter": ["/Hapag-Lloyd/*/"], - "extends": ["config:base", ":semanticCommits", "helpers:pinGitHubActionDigests", ":dependencyDashboard"], + "extends": [ + "config:recommended", + ":semanticCommits", + "helpers:pinGitHubActionDigests", + ":dependencyDashboard" + ], "gitAuthor": "Renovate ", - "includeForks": false, + "forkProcessing": "disabled", "ignorePaths": ["**/modules/**/provider.tf"], "labels": ["dependency"], "onboarding": false, @@ -14,22 +19,31 @@ "packageRules": [ { "matchUpdateTypes": ["patch", "minor"], - "automerge": true + "automerge": true, + "description": "All patch and minor updates are considered safe and will be automerged." }, { "matchPackagePatterns": ["^software.amazon.*", "^com.amazonaws.*"], "groupName": "AWS packages", - "schedule": ["before 11:59am on monday"] + "schedule": ["before 11:59am on monday"], + "description": "There are too many updates to the AWS libraries. Do it once a week." }, { "matchDatasources": ["repology"], "separateMajorMinor": false, "groupName": "repology packages" + }, + { + "matchManagers": ["github-actions"], + "matchFileNames": [".github/workflows/*"], + "groupName": "GitHub Actions", + "description": "Group all github-actions packages together as actions use the same digest." } ], - "regexManagers": [ + "customManagers": [ { + "customType": "regex", "fileMatch": [ "(^|/|\\.)Dockerfile$", "(^|/)Dockerfile[^/]*$", diff --git a/renovate.json b/renovate.json deleted file mode 100644 index e66aae5..0000000 --- a/renovate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["github>Hapag-Lloyd/Renovate-Global-Configuration"] -}