Merge pull request #2331 from camptocamp/c2cciutils-upgrade-1.19

CI updates

.github/workflows/main.yaml

@@ -14,8 +14,8 @@ env:
 
 jobs:
   main:
-    runs-on: ubuntu-22.04
     name: Continuous integration
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
 
@@ -46,7 +46,13 @@ jobs:
       - run: pre-commit run --all-files
         env:
           SKIP: poetry-lock
-      - run: git diff && false
+      - run: git diff --exit-code --patch > /tmp/pre-commit.patch || true
+        if: failure()
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Apply pre-commit fix.patch
+          path: /tmp/pre-commit.patch
+          retention-days: 1
         if: failure()
       - name: Checks
         run: c2cciutils-checks
@@ -73,6 +79,14 @@ jobs:
           retention-days: 5
         if: failure()
 
+      - 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()
       - name: Publish
         run: c2cciutils-publish
         if: env.HAS_SECRETS == 'HAS_SECRETS'

.github/workflows/pull-request-automation.yaml

@@ -26,7 +26,7 @@ jobs:
         with:
           script: |-
             console.log(context);
-      - name: Auto reviews Renovate updates
+      - name: Auto reviews GHCI updates
         uses: actions/github-script@v7
         with:
           script: |-
@@ -37,10 +37,13 @@ jobs:
               event: 'APPROVE',
             })
         if: |-
-          github.event.pull_request.user.login == 'renovate[bot]'
+          startsWith(github.head_ref, 'ghci/audit/')
+          && (github.event.pull_request.user.login == 'ghci-test[bot]'
+            || github.event.pull_request.user.login == 'ghci-int[bot]'
+            || github.event.pull_request.user.login == 'ghci[bot]')
           && (github.event.action == 'opened'
             || github.event.action == 'reopened')
-      - name: Auto review and merge snyk auto fix
+      - name: Auto reviews Renovate updates
         uses: actions/github-script@v7
         with:
           script: |-
@@ -49,62 +52,8 @@ jobs:
               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')
-      - name: Restart audit workflow
-        uses: actions/github-script@v7
-        with:
-          script: |-
-            let runs = await github.rest.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: 'audit.yaml',
-              per_page: 1,
-            });
-            runs = runs.data.workflow_runs;
-            if (runs.length == 1 && runs[0].status != 'success') {
-              console.log(`Rerun workflow ${runs[0].id} ${runs[0].status}`);
-              github.rest.actions.reRunWorkflowFailedJobs({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                run_id: runs[0].id,
-              });
-            }
-        if: |-
-          github.event.pull_request.user.login == 'c2c-bot-gis-ci-2'
-          && (startsWith(github.head_ref, 'snyk-fix/')
-            || startsWith(github.head_ref, 'dpkg-update/'))
-          && github.event.action == 'closed'
-          && github.event.pull_request.merged == true
-      - name: Auto close pre-commit.ci autoupdate
-        uses: actions/github-script@v7
-        with:
-          script: |-
-            github.rest.pulls.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.number,
-              state: 'closed',
-            });
+            })
         if: |-
-          github.event.pull_request.user.login == 'pre-commit-ci'
+          github.event.pull_request.user.login == 'renovate[bot]'
           && (github.event.action == 'opened'
             || github.event.action == 'reopened')