Skip to content

Commit

Permalink
Merge branch 'master' into scala-steward-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom-Hallett authored Oct 17, 2024
2 parents 6555d32 + 6f7b0a2 commit 28e95fe
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/setup.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
)
Expand Down
4 changes: 2 additions & 2 deletions ts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nationalarchives/tdr-generated-graphql",
"version": "1.0.468",
"version": "1.0.471",
"description": "",
"main": "index.ts",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "0.0.387-SNAPSHOT"
ThisBuild / version := "0.0.390-SNAPSHOT"

0 comments on commit 28e95fe

Please sign in to comment.