Merge pull request #1467 from camptocamp/c2cciutils-upgrade

CI updates

.github/renovate.json5

@@ -42,6 +42,13 @@
       matchStrings: ['cdn\\.jsdelivr\\.net/npm/(?<depName>[^@]+)@(?<currentValue>[^/]+)'],
       datasourceTemplate: 'npm',
     },
+    /** Python version in actions/setup-python action */
+    {
+      fileMatch: ['^\\.github/workflows/.*\\.yaml$'],
+      matchStrings: [' python-version: [\'"](?<currentValue>[0-9\\.]+)[\'"]'],
+      datasourceTemplate: 'python-version',
+      depNameTemplate: 'python',
+    },
   ],
   packageRules: [
     /** Docker images versioning */
@@ -129,5 +136,15 @@
       matchPackageNames: ['shellcheck-py/shellcheck-py'],
       versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)$',
     },
+    /** Packages published very recently are not pushed to stabilization branches for security reasons */
+    {
+      matchBaseBranches: ['/^prod-[0-9]+-[0-9]+(-advance)?$/'],
+      minimumReleaseAge: '7 days',
+    },
+    /** Ungroup Python dependencies */
+    {
+      matchDepNames: ['python'],
+      groupName: 'Python',
+    },
   ],
 }

.github/workflows/main.yaml

@@ -13,8 +13,8 @@ env:
 
 jobs:
   main:
-    runs-on: ubuntu-24.04
     name: Continuous integration
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
 
     steps:

.pre-commit-config.yaml

@@ -31,10 +31,6 @@ repos:
     rev: 0.1.0
     hooks:
       - id: integrity-updater
-        include: |-
-          (?x)^(
-            geoportal/geomapfish_geoportal/static/.*
-          )$
   - repo: https://github.com/PyCQA/autoflake
     rev: v2.3.1
     hooks:

ci/config.yaml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.22/c2cciutils/schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.23/c2cciutils/schema.json
 
 version:
   branch_to_version_re:

geoportal/geomapfish_geoportal/static/story-map.html

@@ -13,7 +13,7 @@
     />
     <script
       crossorigin="anonymous"
-      integrity="sha384-a6n81Timk8V6DwQpEN/z1f/LwDsq7B8RkZmZmKeN9fNjLxiytyrNB0zopWBF3N7h"
+      integrity="sha384-wUPhE7IgXYqIsimHW5qy3Pe8voukUPRCGSV8maO4zUVyxsrta+cL6XfdRkedCykV"
       referrerpolicy="no-referrer"
       src="https://geomapfish-demo-2-9.camptocamp.com/api.js?version=2"
     ></script>