From 05d4484608df64ba5d094dced7f4767210d4e54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Mon, 14 Aug 2023 15:09:25 +0200
Subject: [PATCH 1/2] Update to c2cciutils version 1.6 (CI updates)

This is done by the automated script named upgrade-c2cciutils-to-1.6
---
 .github/renovate.json5                                | 11 +++++++++++
 ...auto-review.yaml => dependency-update-review.yaml} |  5 +++--
 .pre-commit-config.yaml                               |  6 ++++++
 ci/config.yaml                                        |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)
 rename .github/workflows/{auto-review.yaml => dependency-update-review.yaml} (61%)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 243857cd..02a24a7a 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -19,6 +19,13 @@
       fileMatch: ['^.pre-commit-config.yaml$'],
       matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
     },
+    {
+      fileMatch: ['^ci/config\\\\.yaml$'],
+      matchStrings: [
+        '.*https://raw\\\\.githubusercontent\\\\.com/(?<depName>[^\\\\s]+)/(?<currentValue>[0-9\\\\.]+)/.*',
+      ],
+      datasourceTemplate: 'github-tags',
+    },
   ],
   packageRules: [
     /** Less strict version for Docker images */
@@ -68,5 +75,9 @@
       matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'],
       enabled: false,
     },
+    {
+      matchPackageNames: ['shellcheck-py/shellcheck-py'],
+      versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)$',
+    },
   ],
 }
diff --git a/.github/workflows/auto-review.yaml b/.github/workflows/dependency-update-review.yaml
similarity index 61%
rename from .github/workflows/auto-review.yaml
rename to .github/workflows/dependency-update-review.yaml
index 342c350f..2d6c98e6 100644
--- a/.github/workflows/auto-review.yaml
+++ b/.github/workflows/dependency-update-review.yaml
@@ -15,7 +15,8 @@ jobs:
 
     steps:
       - name: Auto reviews updates
-        uses: golfzaptw/action-auto-reviews-from-branches@master
+        uses: golfzaptw/action-auto-reviews-from-branches@1.2.3
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }}
           AUTHOR: renovate[bot]
+    if: github.event.pull_request.user.login == 'renovate[bot]'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2c767f0d..26c08a61 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -79,6 +79,11 @@ repos:
     rev: 23.7.0
     hooks:
       - id: black
+  - repo: https://github.com/sbrunner/jsonschema-validator
+    rev: 0.1.0
+    hooks:
+      - id: jsonschema-validator
+        files: ^ci/config\.yaml$
 ci:
   autoupdate_schedule: quarterly
   skip:
@@ -86,3 +91,4 @@ ci:
     - poetry-check
     - poetry-lock
     - ripsecrets
+    - jsonschema-validator
diff --git a/ci/config.yaml b/ci/config.yaml
index ad5ec2c4..a6cc4807 100644
--- a/ci/config.yaml
+++ b/ci/config.yaml
@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.5.8/c2cciutils/schema.json
 
 publish:
   pypi:

From e3b42d3db135c084cb34b409ffae271a6a780642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Tue, 15 Aug 2023 08:15:17 +0200
Subject: [PATCH 2/2] Increase the workflow timeout

---
 .github/workflows/main.yaml    | 2 +-
 .github/workflows/rebuild.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 08c604d0..e0ce1822 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -17,7 +17,7 @@ jobs:
   main:
     runs-on: ubuntu-22.04
     name: Continuous integration
-    timeout-minutes: 210
+    timeout-minutes: 240
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
 
     steps:
diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml
index cd73ac23..c82906e0 100644
--- a/.github/workflows/rebuild.yaml
+++ b/.github/workflows/rebuild.yaml
@@ -8,7 +8,7 @@ jobs:
   main:
     runs-on: ubuntu-22.04
     name: Rebuild
-    timeout-minutes: 210
+    timeout-minutes: 240
 
     strategy:
       fail-fast: false