Merge pull request #11135 from camptocamp/c2cciutils-upgrade-2.8

CI updates

.github/workflows/main.yaml

@@ -14,16 +14,17 @@ env:
 
 jobs:
   not-failed-backport:
-    runs-on: ubuntu-22.04
     name: Test that's not a failed backport
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
+
     steps:
       - run: 'false'
         if: github.event.head_commit.message == '[skip ci] Add instructions to finish the backport.'
 
   main:
-    runs-on: ubuntu-22.04
     name: Continuous integration
+    runs-on: ubuntu-22.04
     timeout-minutes: 150
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
 
@@ -58,8 +59,8 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
       - run: c2cciutils-download-applications --applications-file=ci/applications.yaml --versions-file=ci/applications-versions.yaml
-      - run: scripts/get-version --auto-increment --github
-        id: version
+      - id: version
+        run: scripts/get-version --auto-increment --github
 
       - uses: actions/cache@v3
         with:
@@ -69,7 +70,13 @@ jobs:
       - run: pre-commit run --all-files
         env:
           SKIP: poetry-lock
-      - run: git diff
+      - 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
@@ -122,12 +129,12 @@ jobs:
         if: always()
 
       - uses: actions/upload-artifact@v3
-        if: always()
         with:
           name: Documentation
           path: artifacts/documentations/
           if-no-files-found: ignore
           retention-days: 5
+        if: always()
 
         # Use minimal version from the documentation
       - uses: actions/setup-python@v4
@@ -140,14 +147,14 @@ jobs:
       - run: pip install --user PyYAML==3.13 docker-compose==1.26.0 'docker<7.0.0' urllib3==1.26.15 'requests<2.32.0'
 
         # Test App
-      - run: ci/test-app
-        timeout-minutes: 30
+      - timeout-minutes: 30
+        run: ci/test-app
       - name: Docker logs
+        continue-on-error: true
         run: |
           cd ${HOME}/workspace/testgeomapfishapp/
           c2cciutils-docker-logs
         if: failure()
-        continue-on-error: true
 
       - run: git stash
       - run: git pull --ff-only origin ${{ env.MAIN_BRANCH }}
@@ -169,7 +176,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-      - run: pip install --user PyYAML==5.3.1 docker-compose==1.29.2 'docker<7.0.0' wheel==0.40.0 urllib3==1.26.15 'requests<2.32.0'
+      - run:
+          pip install --user PyYAML==5.3.1 docker-compose==1.29.2 'docker<7.0.0' wheel==0.40.0 urllib3==1.26.15
+          'requests<2.32.0'
 
       - name: Init Git
         run:
@@ -206,6 +215,14 @@ jobs:
         if: >
           env.HAS_SECRETS == 'HAS_SECRETS'
           && steps.version.outputs.versions != ''
+      - 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 version branch to pypi
         run: |
           c2cciutils-publish --group=pypi --type=version_tag --version=${{ steps.version.outputs.full }}

.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')