ci: failfast when merge conflict exists (#30823)

[skip ci]
This commit is contained in:
Ankush Menat 2022-04-27 14:33:26 +05:30 committed by GitHub
parent 85e8dd9a49
commit 3ae9fa98c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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