From 85e79a1da290f7f4ded3f4feb9db60b51dd4aea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Wed, 11 Oct 2023 21:24:31 +0200
Subject: [PATCH] CI updates

This is done by the automated script named upgrade-c2cciutils-to-1.7
---
 .github/renovate.json5                        |  4 +--
 .github/workflows/clean.yaml                  |  1 +
 .github/workflows/dependency-auto-review.yaml | 25 +++++++++++++++++++
 .../workflows/dependency-update-review.yaml   | 22 ----------------
 .github/workflows/main.yaml                   |  4 +--
 ci/requirements.txt                           |  1 +
 pyproject.toml                                |  3 ++-
 7 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 .github/workflows/dependency-auto-review.yaml
 delete mode 100644 .github/workflows/dependency-update-review.yaml

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 56844bb35..1831b72ba 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -19,7 +19,7 @@
   'pre-commit': { enabled: true },
   regexManagers: [
     {
-      fileMatch: ['^.pre-commit-config\\.yaml$'],
+      fileMatch: ['^\\.pre\\-commit\\-config\\.yaml$'],
       matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
     },
     {
@@ -30,7 +30,7 @@
       datasourceTemplate: 'github-tags',
     },
     {
-      fileMatch: ['^ci/dpkg-versions\\.yaml$'],
+      fileMatch: ['^ci/dpkg\\-versions\\.yaml$'],
       matchStrings: [" *(?<depName>[^'\\s]+): '?(?<currentValue>[^'\\s/]*[0-9][^'\\s/]*)'?"],
       datasourceTemplate: 'repology',
       versioningTemplate: 'loose',
diff --git a/.github/workflows/clean.yaml b/.github/workflows/clean.yaml
index a556e58ba..c33d8fdfb 100644
--- a/.github/workflows/clean.yaml
+++ b/.github/workflows/clean.yaml
@@ -5,6 +5,7 @@ on:
   pull_request:
     types:
       - closed
+
 jobs:
   clean:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/dependency-auto-review.yaml b/.github/workflows/dependency-auto-review.yaml
new file mode 100644
index 000000000..d09719021
--- /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 2d6c98e68..000000000
--- 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 caefd49ed..395e7c6f0 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -43,8 +43,8 @@ jobs:
           SKIP: poetry-lock,isort
       - run: git diff && false
         if: failure()
-      - name: Checks
-        run: c2cciutils-checks
+      - name: Print environment information
+        run: c2cciutils-env
 
       - name: Pull
         run: make pull
diff --git a/ci/requirements.txt b/ci/requirements.txt
index 0d697db07..ab600d470 100644
--- a/ci/requirements.txt
+++ b/ci/requirements.txt
@@ -4,3 +4,4 @@ poetry-plugin-export==1.5.0
 pre-commit==3.4.0
 pytest==7.4.2
 scikit-image==0.21.0
+poetry-plugin-tweak-dependencies-version==1.5.1
diff --git a/pyproject.toml b/pyproject.toml
index d0b1f7013..d40ea32ff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -190,7 +190,8 @@ prospector-profile-duplicated = "0.3.0"
 requires = [
   "poetry-core>=1.0.0",
   "poetry-dynamic-versioning[plugin]",
-  "poetry-plugin-tweak-dependencies-version"
+  "poetry-plugin-tweak-dependencies-version",
+  "poetry-plugin-drop-python-upper-constraint"
 ]
 build-backend = "poetry.core.masonry.api"