diff --git a/build.sh b/build.sh index 9f180158f3ac491e3292ae9d270f9011864470ab..f5ef38f9fb847f1c4e3e89720a6c1b4d3e7e33e5 100755 --- a/build.sh +++ b/build.sh @@ -9,6 +9,10 @@ comp_type=$4 branch=$5 with_gpu=$6 +echo "Trying to Fix the CI" +rm -rf .git/modules/gdbgui/rebase-merge + + if [ x"$branch" == x"" ]; then echo "Getting branch from git" branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3)