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..80f55bd 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 181243999+tna-da-bot@users.noreply.github.com + git config --global user.name tna-da-bot git checkout -b $BRANCH_NAME git add -A git commit -m "Droid version bump"