From 2efb6ddd9ba818f5252bcd2e2098d137e43a0be5 Mon Sep 17 00:00:00 2001
From: Tiago Silva <tfn.da.silva@gmail.com>
Date: Thu, 29 Aug 2024 19:11:36 +0100
Subject: [PATCH] Use create-pull-request only

---
 .github/workflows/update_browserslist.yaml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/update_browserslist.yaml b/.github/workflows/update_browserslist.yaml
index 54fc217ba..d64991408 100644
--- a/.github/workflows/update_browserslist.yaml
+++ b/.github/workflows/update_browserslist.yaml
@@ -36,16 +36,6 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - name: Commit changes
-        if: steps.update-browserslist-db.outputs.should_update == 'true'
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          create_branch: true
-          branch: 'update-browserslist-db/${{ steps.update-browserslist-db.outputs.latest_version }}'
-          commit_message: '[CI] Update browserslist DB to  ${{ steps.update-browserslist-db.outputs.latest_version }}'
-          commit_user_name: ${{ steps.import-gpg.outputs.name }}
-          commit_user_email: ${{ steps.import-gpg.outputs.email }}
-
       - name: Create Pull Request
         if: steps.update-browserslist-db.outputs.should_update == 'true'
         uses: peter-evans/create-pull-request@v6
@@ -53,10 +43,13 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           committer: ${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>
           author: ${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>
+          commit-message: '[CI] Update browserslist DB to ${{ steps.update-browserslist-db.outputs.latest_version }}'
           title: 'Bump browserslist DB from ${{ steps.update-browserslist-db.outputs.installed_version }} to ${{ steps.update-browserslist-db.outputs.latest_version }}'
           body: |
             Bumps caniuse-lite from ${{ steps.update-browserslist-db.outputs.installed_version }} to ${{ steps.update-browserslist-db.outputs.latest_version }}.
             Update output: ${{ steps.update-browserslist-db.outputs.update_output }}
           labels: 'dependencies'
-          branch: 'update-browserslist-db/${{ steps.update-browserslist-db.outputs.latest_version }}'
+          branch: 'update-browserslist-db'
+          delete-branch: true
+          branch-suffix: '${{ steps.update-browserslist-db.outputs.latest_version }}'
           base: 'main'