Skip to content

Commit

Permalink
Remove the bors-auto-branch short circuit from ci-build.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
graydon committed Jun 28, 2024
1 parent 12f36e1 commit 5df9121
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,6 @@ NPROCS=$(getconf _NPROCESSORS_ONLN)
echo "Found $NPROCS processors"
date

# Short-circuit transient 'auto-initialization' builds
git fetch origin master
MASTER=$(git describe --always FETCH_HEAD)
HEAD=$(git describe --always HEAD)
echo $MASTER
echo $HEAD
if [ $HEAD == $MASTER ]
then
echo "HEAD SHA1 equals master; probably just establishing merge, exiting build early"
exit 1
fi

# Try to ensure we're using the real g++ and clang++ versions we want
mkdir bin

Expand Down

0 comments on commit 5df9121

Please sign in to comment.