diff --git a/.github/mergify.yml b/.github/mergify.yml index 12585552..7edd925b 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" - "check-success=security/snyk (nationalarchives)" - or: diff --git a/.github/scripts/setup.sh b/.github/scripts/setup.sh index 8b00f06f..91d2dd9b 100755 --- a/.github/scripts/setup.sh +++ b/.github/scripts/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -git config --global user.email digitalpreservation@nationalarchives.gov.uk -git config --global user.name tna-digital-archiving-jenkins +git config --global 181243999+tna-da-bot@users.noreply.github.com +git config --global user.name tna-da-bot git checkout -b $BRANCH_NAME git push -u origin $BRANCH_NAME mkdir -p src/main/resources diff --git a/build.sbt b/build.sbt index bbbd2641..417e2077 100644 --- a/build.sbt +++ b/build.sbt @@ -25,9 +25,9 @@ scmInfo := Some( developers := List( Developer( - id = "tna-digital-archiving-jenkins", + id = "tna-da-bot", name = "TNA Digital Archiving", - email = "digitalpreservation@nationalarchives.gov.uk", + email = "s-GitHubDABot@nationalarchives.gov.uk", url = url("https://github.com/nationalarchives/tdr-generated-grapqhl") ) )