CI updates

This is done by the automated script named upgrade-c2cciutils-to-1.7
camptocamp · Jun 7, 2024 · f012a6a · f012a6a
1 parent 9d825f8
commit f012a6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 43 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -58,14 +58,14 @@ jobs:
       - run: pre-commit run --all-files
         env:
           SKIP: poetry-lock,pipenv-lock,helm-lock
+      - 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()
-      - run: git diff --exit-code --patch > /tmp/pre-commit.patch || true
-        if: failure()
       - name: Print the environment
         run: c2cciutils-env
         env:

diff --git a/.github/workflows/pull-request-automation.yaml b/.github/workflows/pull-request-automation.yaml
@@ -5,14 +5,10 @@ on:
     types:
       - opened
       - reopened
-      - closed
-  pull_request_target:
-    types:
-      - closed
 
 jobs:
   auto-merge:
-    name: Auto reviews, merge and close pull requests
+    name: Auto reviews pull requests from bots
     runs-on: ubuntu-22.04
     timeout-minutes: 5
 
@@ -38,11 +34,9 @@ jobs:
             })
         if: |-
           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')
+          && (github.event.pull_request.user.login == 'geo-ghci-test[bot]'
+            || github.event.pull_request.user.login == 'geo-ghci-int[bot]'
+            || github.event.pull_request.user.login == 'geo-ghci[bot]')
       - name: Auto reviews Renovate updates
         uses: actions/github-script@v7
         with:
@@ -55,34 +49,3 @@ jobs:
             })
         if: |-
           github.event.pull_request.user.login == 'renovate[bot]'
-          && (github.event.action == 'opened'
-            || github.event.action == 'reopened')
-      - name: Auto review and merge dpkg updates
-        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, 'dpkg-update/')
-          && (github.event.action == 'opened'
-            || github.event.action == 'reopened')