search

ExchangeUnion / xud-docker

Streamlined setup of xud and all dependencies via docker 🐳
https://docs.exchangeunion.com
GNU Affero General Public License v3.0
5 stars 5 forks source link

tools: fix master auto-build when a feature branch merged #777

Closed reliveyy closed 3 years ago

reliveyy commented 3 years ago

This PR fixes master auto-build when a feature branch merged in. There is no modified images detected because on master branch

git diff --name-only $(git merge-base --fork-point origin/master)..HEAD images

equals to

git diff --name-only HEAD..HEAD images

which will result in an empty diff set for sure. This PR fixes it by using another diff command on master

git diff --name-only HEAD^..HEAD images

It diffs with one commit before. I know this is not a perfect solution but it's the easiest way and covers most cases especially when we following "Squash and merge" practice for all PRs.