only commit from upstream on change to avoid error-ing, add TODO for JSON linting

This commit is contained in:
Collin M. Barrett 2020-02-15 11:48:12 -06:00
parent 191dffbcbe
commit b235af1ebd

View file

@ -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())