Merge branch 'master' into feature/go-native-trace

.circleci/config.yml

@@ -154,7 +154,21 @@ shallow-checkout: &shallow-checkout
     name: shallow checkout
     command: |
       mkdir ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-      git clone --quiet --depth 1 "$CIRCLE_REPOSITORY_URL" --branch "$CIRCLE_BRANCH" ~/repos/geth
+      # CIRCLE_PR_NUMBER is only set for forked PRs and for forked PRs we need
+      # a different approach to check out the branch.
+      if [ -z ${CIRCLE_PR_NUMBER} ]; then
+        # Non forked PR
+        git clone --quiet --depth 1 ${CIRCLE_REPOSITORY_URL} --branch ${CIRCLE_BRANCH} ~/repos/geth 
+      else
+        # Forked PR, in this case we need to fetch the remote ref (because its not a branch so we can't clone directly to it)
+        # See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
+        
+        # Use the github api to get the branch name
+        git clone --quiet --depth 1 ${CIRCLE_REPOSITORY_URL} ~/repos/geth  
+        cd ~/repos/geth
+        git fetch --depth 1 origin pull/${CIRCLE_PR_NUMBER}/head:${CIRCLE_BRANCH}
+        git checkout ${CIRCLE_BRANCH}
+      fi
 
 install-go: &install-go
   run:

scripts/sync_test.sh

@@ -12,13 +12,16 @@ if [ -z "$MODE" ]; then
   echo "Set MODE to the sync mode"
   exit 3
 fi
-LOGFILE=/tmp/sync_test.log
 
+MARK=`date +%s`
 # Do the sync
 echo "Running geth sync"
-build/bin/geth --datadir $DATADIR --syncmode $MODE --exitwhensynced >> $LOGFILE 2>&1
-echo "Checking sync result"
-MARK=`date +%s`
+echo "-----------------"
+build/bin/geth --datadir $DATADIR --syncmode $MODE --exitwhensynced
+
+echo "-------------------------------"
+echo "Geth exited cheking sync status"
+echo "-------------------------------"
 
 # Now check what the latest block is
 ATTEMPTS=10