Update update_leaderboard.yml

.github/workflows/update_leaderboard.yml

@@ -1,6 +1,3 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 name: update_leaderboard_daily
 
 on:
@@ -8,11 +5,10 @@ on:
     - cron: '30 2 * * *'
   push:
     branches: [ main ]
-  workflow_dispatch: # Allows us to trigger the workflow manually via the GitHub UI
+  workflow_dispatch:
 
 jobs:
-  build:
-
+  update-and-merge:
     runs-on: ubuntu-latest
     
     steps:
@@ -30,16 +26,39 @@ jobs:
     - name: Run leaderboard updating code
       run: |
         python refresh.py
-    - name: Commit updates
-      uses: stefanzweifel/git-auto-commit-action@v4
+    - name: Create Pull Request
+      id: cpr
+      uses: peter-evans/create-pull-request@v5
       with:
-        commit_message: Automated Leaderboard Update
-        file_pattern: '*.json boards_data/* all_data_tasks/*'
-        # Needed so that it can override the PR settings
-        commit_user_name: Orion Weller
-        commit_user_email: wellerorion@gmail.com
-        commit_author: Orion Weller <wellerorion@gmail.com>
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: Automated Leaderboard Update
+        title: Automated Leaderboard Update
+        body: This is an automated PR to update the leaderboard.
+        branch: automated-leaderboard-update
+        delete-branch: true
+        file-pattern: '*.json boards_data/* all_data_tasks/*'
+        committer: Orion Weller <wellerorion@gmail.com>
+        author: Orion Weller <wellerorion@gmail.com>
+    - name: Enable Pull Request Automerge
+      if: steps.cpr.outputs.pull-request-operation == 'created'
+      uses: peter-evans/enable-pull-request-automerge@v3
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+        merge-method: squash
+    - name: Automatically merge PR if all checks pass
+      if: steps.cpr.outputs.pull-request-operation == 'created'
+      uses: pascalgn/automerge-action@v0.15.6
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PULL_REQUEST: ${{ steps.cpr.outputs.pull-request-number }}
+        MERGE_LABELS: ""
+        MERGE_METHOD: squash
+        MERGE_COMMIT_MESSAGE: "pull-request-title"
+        MERGE_RETRIES: "6"
+        MERGE_RETRY_SLEEP: "10000"
     - name: Push to hub
+      if: steps.cpr.outputs.pull-request-operation == 'closed'
       env:
         HF_TOKEN: ${{ secrets.HF_TOKEN }}
       run: git push https://mteb:$HF_TOKEN@huggingface.co/spaces/mteb/leaderboard main