From 37306b1166bda80f903c06e0163274da970f4d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 11 Oct 2023 15:14:10 +0200 Subject: [PATCH 1/2] CI updates This is done by the automated script named upgrade-c2cciutils-to-1.7 --- .github/renovate.json5 | 6 ++--- .github/workflows/backport.yaml | 1 - .github/workflows/dependency-auto-review.yaml | 25 +++++++++++++++++++ .../workflows/dependency-update-review.yaml | 22 ---------------- .github/workflows/main.yaml | 4 +-- ci/config.yaml | 4 --- 6 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/dependency-auto-review.yaml delete mode 100644 .github/workflows/dependency-update-review.yaml delete mode 100644 ci/config.yaml diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 990a05f95d1e..fb4c6c212127 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -13,7 +13,7 @@ 'pre-commit': {enabled: true}, regexManagers: [ { - fileMatch: ['^.pre-commit-config.yaml$'], + fileMatch: ['^\\.pre\\-commit\\-config\\.yaml$'], matchStrings: [" +- '?(?[^' @=]+)(@|==)(?[^' @=]+)'? # (?.+)"], }, { @@ -29,14 +29,14 @@ { 'fileMatch': ['^ci/config\\\\.yaml$'], 'matchStrings': [ - '.*https://raw\\\\.githubusercontent\\\\.com/(?[^\\\\s]+)/(?[0-9\\\\.]+)/.*', + '.*https://raw\\.githubusercontent\\.com/(?[^\\s]+)/(?[0-9\\.]+)/.*', ], 'datasourceTemplate': 'github-tags', }, { 'fileMatch': ['^ci/config\\\\.yaml$'], 'matchStrings': [ - '.*https://raw\\\\.githubusercontent\\\\.com/(?[^\\\\s]+)/(?[0-9\\\\.]+)/.*', + '.*https://raw\\.githubusercontent\\.com/(?[^\\s]+)/(?[0-9\\.]+)/.*', ], 'datasourceTemplate': 'github-tags', }, diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index 2d6c29aa4e4a..ea959e8eef35 100644 --- a/.github/workflows/backport.yaml +++ b/.github/workflows/backport.yaml @@ -1,4 +1,3 @@ ---- name: Backport on: diff --git a/.github/workflows/dependency-auto-review.yaml b/.github/workflows/dependency-auto-review.yaml new file mode 100644 index 000000000000..d09719021d91 --- /dev/null +++ b/.github/workflows/dependency-auto-review.yaml @@ -0,0 +1,25 @@ +name: Auto reviews updates + +on: + pull_request: + types: + - opened + - reopened + +jobs: + auto-merge: + name: Auto reviews updates + runs-on: ubuntu-22.04 + timeout-minutes: 5 + + steps: + - uses: actions/github-script@v6 + with: + script: |- + github.rest.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.payload.pull_request.number, + event: 'APPROVE', + }) + if: github.event.pull_request.user.login == 'renovate[bot]' diff --git a/.github/workflows/dependency-update-review.yaml b/.github/workflows/dependency-update-review.yaml deleted file mode 100644 index 2d6c98e68085..000000000000 --- a/.github/workflows/dependency-update-review.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: Auto reviews updates - -on: - pull_request: - types: - - opened - - reopened - - synchronize - -jobs: - auto-merge: - name: Auto reviews updates - runs-on: ubuntu-22.04 - timeout-minutes: 5 - - steps: - - name: Auto reviews updates - uses: golfzaptw/action-auto-reviews-from-branches@1.2.3 - with: - GITHUB_TOKEN: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }} - AUTHOR: renovate[bot] - if: github.event.pull_request.user.login == 'renovate[bot]' diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8f01b793e16b..f55d828bee1f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -81,8 +81,8 @@ jobs: - run: pre-commit run --all-files - run: git diff && false if: failure() - - name: Checks - run: c2cciutils-checks + - name: Print environment information + run: c2cciutils-env - run: | sudo rm /etc/apt/sources.list.d/*.list diff --git a/ci/config.yaml b/ci/config.yaml deleted file mode 100644 index d1dcebcd1495..000000000000 --- a/ci/config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.5.8/c2cciutils/schema.json - -checks: - codespell: false From 6883798f8342ef04a5c2f5d9790fad123a08b773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 11 Oct 2023 15:17:54 +0200 Subject: [PATCH 2/2] Fix Renovate config --- .github/renovate.json5 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index fb4c6c212127..99505b23ba4a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -17,24 +17,17 @@ matchStrings: [" +- '?(?[^' @=]+)(@|==)(?[^' @=]+)'? # (?.+)"], }, { - fileMatch: ['^ci/applications-versions.yaml$'], + fileMatch: ['^ci/applications\\-versions\\.yaml$'], matchStrings: ['(?[^\\s]+): (?[^\\s]+) # (?[^\\s]+)'], }, { - fileMatch: ['^.github/workflows/main.yaml$'], + fileMatch: ['^.github/workflows/main\\.yaml$'], matchStrings: ["node-version: '(?[^\\s]+).x'"], depNameTemplate: 'node', datasourceTemplate: 'node', }, { - 'fileMatch': ['^ci/config\\\\.yaml$'], - 'matchStrings': [ - '.*https://raw\\.githubusercontent\\.com/(?[^\\s]+)/(?[0-9\\.]+)/.*', - ], - 'datasourceTemplate': 'github-tags', - }, - { - 'fileMatch': ['^ci/config\\\\.yaml$'], + 'fileMatch': ['^ci/config\\.yaml$'], 'matchStrings': [ '.*https://raw\\.githubusercontent\\.com/(?[^\\s]+)/(?[0-9\\.]+)/.*', ],