Merge pull request #1055 from camptocamp/c2cciutils-upgrade

CI updates

Author: sbrunner

.github/renovate.json5

@@ -65,22 +65,22 @@
     /** Docker images version */
     {
       matchDatasources: ['docker'],
-      matchPackageNames: ['ghcr.io/osgeo/gdal'],
       versioning: 'regex:^(?<compatibility>.*)-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$',
+      matchDepNames: ['ghcr.io/osgeo/gdal'],
     },
     {
       matchDatasources: ['docker'],
-      matchPackageNames: ['python'],
       versioning: 'regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$',
+      matchDepNames: ['python'],
     },
     /** Group Poetry packages */
     {
-      matchPackageNames: ['poetry', 'pip'],
       matchPackagePrefixes: ['poetry-'],
       groupName: 'Poetry',
       automerge: true,
       separateMajorMinor: false,
       separateMinorPatch: false,
+      matchDepNames: ['poetry', 'pip'],
     },
     /** Accept only the patch on stabilization branches */
     {
@@ -90,27 +90,27 @@
     },
     /** Support the 4 parts of shellcheck-py version with a v prefix */
     {
-      matchPackageNames: ['shellcheck-py/shellcheck-py'],
       versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)$',
+      matchDepNames: ['shellcheck-py/shellcheck-py'],
     },
     /** Disable upgrading the supported Python version */
     {
       matchFileNames: ['pyproject.toml'],
-      matchPackageNames: ['python'],
       enabled: false,
+      matchDepNames: ['python'],
     },
     /** Only LTS version of Node */
     {
       allowedVersions: '/(0|2|4|6|8)$/',
-      matchPackageNames: ['node'],
       enabled: false,
+      matchDepNames: ['node'],
     },
     /** Group the Python update of the acceptance image */
     {
       matchFileNames: ['acceptance_tests/*'],
-      matchPackageNames: ['python'],
       automerge: true,
       groupName: 'acceptance tests Python',
+      matchDepNames: ['python'],
     },
     /** Group and auto merge the CI dependencies */
     {

.github/workflows/delete-old-workflows-run.yaml

@@ -113,3 +113,11 @@ jobs:
       - name: Publish
         run: c2cciutils-publish
         if: env.HAS_SECRETS == 'HAS_SECRETS'
+      - run: git diff --exit-code --patch > /tmp/dpkg-versions.patch || true
+        if: failure()
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Update dpkg versions list.patch
+          path: /tmp/dpkg-versions.patch
+          retention-days: 1
+        if: failure()

.github/workflows/main.yaml

@@ -86,32 +86,3 @@ jobs:
           && startsWith(github.head_ref, 'dpkg-update/')
           && (github.event.action == 'opened'
             || github.event.action == 'reopened')
-      - name: Auto review and merge snyk auto fix
-        uses: actions/github-script@v7
-        with:
-          script: |-
-            github.rest.pulls.createReview({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.number,
-              event: 'APPROVE',
-            });
-            github.graphql(`
-              mutation {
-                enablePullRequestAutoMerge(input: {
-                  pullRequestId: "${context.payload.pull_request.node_id}",
-                  mergeMethod: SQUASH,
-                }) {
-                  pullRequest {
-                    autoMergeRequest {
-                      enabledAt
-                    }
-                  }
-                }
-              }
-            `)
-        if: |-
-          github.event.pull_request.user.login == 'c2c-bot-gis-ci-2'
-          && startsWith(github.head_ref, 'snyk-fix/')
-          && (github.event.action == 'opened'
-            || github.event.action == 'reopened')