Merge branch 'master' into scala-steward-dependencies

nationalarchives · Oct 22, 2024 · 12e4265 · 12e4265
2 parents e146beb + 87a87d4
commit 12e4265
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -6,7 +6,7 @@ queue_rules:
 pull_request_rules:
   - name: automatic merge for Scala Steward
     conditions:
-      - author=tna-digital-archiving-jenkins
+      - author=tna-da-bot
       - "check-success=test / test"
       - "check-success=security/snyk (nationalarchives)"
       - or:

diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml
@@ -26,8 +26,8 @@ jobs:
         continue-on-error: true
       - if: steps.check-diff.outcome != 'success'
         run: |
-          git config --global user.email [email protected]
-          git config --global user.name tna-digital-archiving-jenkins
+          git config --global user.email [email protected]
+          git config --global user.name tna-da-bot
           git checkout -b $BRANCH_NAME
           git add -A 
           git commit -m "Droid version bump"