From 8b36db3334d6da9472ba5c8a0db2d87e901ab3c0 Mon Sep 17 00:00:00 2001 From: Tom Hallett Date: Wed, 2 Oct 2024 11:11:28 +0100 Subject: [PATCH 1/2] Migrate to using new Github bot user --- .github/mergify.yml | 2 +- .github/workflows/versions.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index b4bee73..e4e4a30 100644 --- 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 index a2c477f..165d46b 100644 --- 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 digitalpreservation@nationalarchives.gov.uk - git config --global user.name tna-digital-archiving-jenkins + git config --global user.email s-GitHubDABot@nationalarchives.gov.uk + git config --global user.name tna-da-bot git checkout -b $BRANCH_NAME git add -A git commit -m "Droid version bump" From 8eec863b15d0586ff5651a9b34c06dec0bf03fa7 Mon Sep 17 00:00:00 2001 From: Tom Hallett Date: Mon, 7 Oct 2024 09:13:30 +0100 Subject: [PATCH 2/2] Updating bot email address --- .github/workflows/versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index 165d46b..80f55bd 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -26,7 +26,7 @@ jobs: continue-on-error: true - if: steps.check-diff.outcome != 'success' run: | - git config --global user.email s-GitHubDABot@nationalarchives.gov.uk + git config --global user.email 181243999+tna-da-bot@users.noreply.github.com git config --global user.name tna-da-bot git checkout -b $BRANCH_NAME git add -A