mirror of
https://github.com/gomods/athens
synced 2026-02-03 09:50:31 +00:00
37f0687761
* add script and step to verify stage of makefile * this commit should fail the build * build should now pass * fix typo in excludes for grep * better output on failure also removes tilde from initial regex, git does not use tilde in diffs adds output of filenames with detected regex on failure
23 lines
923 B
Bash
Executable File
23 lines
923 B
Bash
Executable File
#!/bin/bash
|
|
|
|
# check_conflicts.sh
|
|
# this script checks for changes to files OTHER THAN *.go, go.mod and go.sum
|
|
# ensuring no git merge conflict artifacts are being commited.
|
|
# i.e. <<<<<<<HEAD or ======= or >>>>>>>branch-name
|
|
#
|
|
# this is intended to be used in your CI tests
|
|
#
|
|
# the script will exit with code 1 on finding any matches, causing the
|
|
# CI build to fail. Merge conflict artifacts must be removed before continuing.
|
|
|
|
git remote set-branches --add origin master && git fetch
|
|
COUNT=$(git diff origin/master -- . ':!*.go' ':!go.mod' ':!go.sum' | grep -Ec "^\+[<>=]{7}\w{0,}")
|
|
|
|
if (($COUNT > 0));then
|
|
echo "************************************************************"
|
|
echo "The following files contained merge conflict artifacts:\n"
|
|
exec git diff --name-only -G'^[<>=]{7}\w?' origin/master -- . ':!*.go' ':!go.mod' ':!go.sum'
|
|
echo "************************************************************"
|
|
exit 1
|
|
fi
|