[Develop] Support all BK/Travis cases in Submodule Regression Script

.cicd/submodule-regression-check.sh

@@ -4,31 +4,49 @@ declare -A PR_MAP
 declare -A BASE_MAP
 # Support Travis and BK
 if ${TRAVIS:-false}; then
+    [[ -z $TRAVIS_PULL_REQUEST_BRANCH ]] && echo "Unable to find TRAVIS_PULL_REQUEST_BRANCH ENV. Skipping submodule regression check." && exit 0
     BASE_BRANCH=$TRAVIS_BRANCH
-    CURRENT_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} # We default to TRAVIS_BRANCH if it's not a PR so it passes on non PR runs
+    CURRENT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
+    [[ ! -z $TRAVIS_PULL_REQUEST_SLUG ]] && CURRENT_BRANCH=$TRAVIS_COMMIT # When we're not running from a PR, the slug is not set. When we are, we need to use the TRAVIS_COMMIT to be sure we're supporting the Forked PR's merge/code that's in the EOS repo. This is needed for the git log below.
 else
-    BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}
+    [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]] && echo "Unable to find BUILDKITE_PULL_REQUEST_BASE_BRANCH ENV. Skipping submodule regression check." && exit 0
+    BASE_BRANCH=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
     CURRENT_BRANCH=$BUILDKITE_BRANCH
 fi
+
 echo "getting submodule info for $CURRENT_BRANCH"
 while read -r a b; do
     PR_MAP[$a]=$b
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
+
 echo "getting submodule info for $BASE_BRANCH"
 git checkout $BASE_BRANCH &> /dev/null
 git submodule update --init &> /dev/null
 while read -r a b; do
     BASE_MAP[$a]=$b
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
+
+# We need to switch back to the PR ref/head so we can git log properly
+if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then
+    echo "git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:"
+    git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: &> /dev/null
+    echo "switching back to $TRAVIS_COMMIT"
+    echo 'git checkout -qf FETCH_HEAD'
+    git checkout -qf FETCH_HEAD &> /dev/null
+elif [[ $BUILDKITE == true ]]; then
+    echo "switching back to $CURRENT_BRANCH"
+    git checkout -f $CURRENT_BRANCH &> /dev/null
+fi
+
 for k in "${!BASE_MAP[@]}"; do
     base_ts=${BASE_MAP[$k]}
     pr_ts=${PR_MAP[$k]}
     echo "submodule $k"
     echo "  timestamp on $CURRENT_BRANCH: $pr_ts"
     echo "  timestamp on $BASE_BRANCH: $base_ts"
     if (( $pr_ts < $base_ts)); then
-        echo "$k is older on $CURRENT_BRANCH than $BASE_BRANCH; investigating..."
-        if for c in `git log $CURRENT_BRANCH ^$BASE_BRANCH --pretty=format:"%H"`; do git show --pretty="" --name-only $c; done | grep -q "^$k$"; then
+        echo "$k is older on $CURRENT_BRANCH than $BASE_BRANCH; investigating the difference between $CURRENT_BRANCH and $BASE_BRANCH to look for $k changing..."
+        if [[ ! -z $(for c in $(git --no-pager log $CURRENT_BRANCH ^$BASE_BRANCH --pretty=format:"%H"); do git show --pretty="" --name-only $c; done | grep "^$k$") ]]; then
             echo "ERROR: $k has regressed"
             exit 1
         else

.travis.yml

@@ -48,7 +48,7 @@ matrix:
             - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
+script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=