Skip to content

Commit

Permalink
ci: failfast when merge conflict exists (frappe#30823)
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
ankush authored Apr 27, 2022
1 parent 85e8dd9 commit 3ae9fa9
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

set -e

# Check for merge conflicts before proceeding
python -m compileall -f "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
fi

cd ~ || exit

sudo apt-get install redis-server libcups2-dev
Expand Down

0 comments on commit 3ae9fa9

Please sign in to comment.