From b235af1ebd1a25c6dafe747a6f67df891265291e Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 15 Feb 2020 11:48:12 -0600 Subject: [PATCH] only commit from upstream on change to avoid error-ing, add TODO for JSON linting --- server/azure-pipelines.migrate.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/azure-pipelines.migrate.yaml b/server/azure-pipelines.migrate.yaml index bf90b958c..64a2d4bc0 100644 --- a/server/azure-pipelines.migrate.yaml +++ b/server/azure-pipelines.migrate.yaml @@ -1,5 +1,6 @@ # Adds an Entity Framework Core migration to a pull request that changes data in data/*.json +# TODO: sort/lint JSON and push as a part of this bot work # TODO: if data/* or server/src/FilterLists.Data.Migrations/* change in origin/master, re-trigger this Pipeline. trigger: none @@ -77,7 +78,9 @@ steps: echo "Data changes conflict with upstream master. Aborting..." exit 1 fi - git commit -m "merge upstream data" + if [[ $(git status -uno --porcelain) ]] ; then + git commit -m "merge upstream data" + fi displayName: merge upstream data condition: and(ne(variables['abortIfJustMigrated.aborted'], 'true'), succeeded())