From bbecffdd2f11b9821710dccd20be793d1e4476f6 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 16 Sep 2019 17:52:50 -0400 Subject: [PATCH 1/8] changes to script --- .cicd/submodule-regression-check.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh index d0dc7bf117d..8baec667100 100755 --- a/.cicd/submodule-regression-check.sh +++ b/.cicd/submodule-regression-check.sh @@ -1,25 +1,31 @@ #!/bin/bash set -eo pipefail +[[ $(uname) == 'Darwin' ]] && echo "Submodule regression doesn't run on mac (declare: -A: invalid option).." && exit 0 declare -A PR_MAP declare -A BASE_MAP # Support Travis and BK if ${TRAVIS:-false}; then 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 + [[ ! -z $TRAVIS_PULL_REQUEST_SLUG ]] && CURRENT_BRANCH=$TRAVIS_COMMIT # Support git log & echo output else BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH} CURRENT_BRANCH=$BUILDKITE_BRANCH fi +[[ $BASE_BRANCH == $CURRENT_BRANCH ]] && echo 'BASE_BRANCH and CURRENT_BRANCH are the same' && exit 0 + 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`') + for k in "${!BASE_MAP[@]}"; do base_ts=${BASE_MAP[$k]} pr_ts=${PR_MAP[$k]} @@ -28,7 +34,17 @@ for k in "${!BASE_MAP[@]}"; do 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 + if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then # IF it's a forked PR, we need to switch back to the PR ref/head so we can git log properly + 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_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($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 + 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 From 869bc39294fe4254d5895cdc24221d0cce3c9138 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 16 Sep 2019 18:09:01 -0400 Subject: [PATCH 2/8] moved logic to skip mac: --- .cicd/submodule-regression-check.sh | 1 - .travis.yml | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh index 8baec667100..a8135440e74 100755 --- a/.cicd/submodule-regression-check.sh +++ b/.cicd/submodule-regression-check.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eo pipefail -[[ $(uname) == 'Darwin' ]] && echo "Submodule regression doesn't run on mac (declare: -A: invalid option).." && exit 0 declare -A PR_MAP declare -A BASE_MAP # Support Travis and BK diff --git a/.travis.yml b/.travis.yml index 110f2756374..2388b63f36e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,11 @@ 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: " +if [[ $(uname) != 'Darwin' ]]; then + ./.cicd/submodule-regression-check.sh +fi +ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh" 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= From 06137378586c6b63baf0cf4febeed875706422fb Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 16 Sep 2019 18:12:42 -0400 Subject: [PATCH 3/8] quick travis script cleanup --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2388b63f36e..3ab2674b20b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,9 +49,7 @@ matrix: env: - PATH="/usr/local/opt/ccache/libexec:$PATH" script: " -if [[ $(uname) != 'Darwin' ]]; then - ./.cicd/submodule-regression-check.sh -fi +[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh" notifications: webhooks: From da178de4ed7967eaa6a650ec12a2338bf15d6f69 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 16 Sep 2019 18:19:53 -0400 Subject: [PATCH 4/8] quick travis script cleanup --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ab2674b20b..b848d7d8b97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,8 +49,7 @@ matrix: env: - PATH="/usr/local/opt/ccache/libexec:$PATH" script: " -[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh -ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh" +[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh" 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= From e5a89b873c29e3e87ac616fd95502d869b9c9de3 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 16 Sep 2019 18:30:06 -0400 Subject: [PATCH 5/8] quick travis script cleanup --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b848d7d8b97..eab89413569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,7 @@ matrix: - ccache env: - PATH="/usr/local/opt/ccache/libexec:$PATH" -script: " -[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh" +script: "[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh" 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= From 0e6f8e96bb888831852c83211fd2d91c7e41dfdf Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Tue, 17 Sep 2019 10:38:21 -0400 Subject: [PATCH 6/8] submodule last in scripts --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eab89413569..bd9c3ee801a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: - ccache env: - PATH="/usr/local/opt/ccache/libexec:$PATH" -script: "[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; 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 && [[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh" 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= From c8539c7505a9a0a1d391e4e20179694fc7fc4b65 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Tue, 17 Sep 2019 11:55:51 -0400 Subject: [PATCH 7/8] Added changes for Areg (better failure on missing ENVs) --- .cicd/submodule-regression-check.sh | 33 ++++++++++++++++------------- .travis.yml | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh index a8135440e74..e8e9c8772cd 100755 --- a/.cicd/submodule-regression-check.sh +++ b/.cicd/submodule-regression-check.sh @@ -4,14 +4,15 @@ 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 - [[ ! -z $TRAVIS_PULL_REQUEST_SLUG ]] && CURRENT_BRANCH=$TRAVIS_COMMIT # Support git log & echo output + 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 -[[ $BASE_BRANCH == $CURRENT_BRANCH ]] && echo 'BASE_BRANCH and CURRENT_BRANCH are the same' && exit 0 echo "getting submodule info for $CURRENT_BRANCH" while read -r a b; do @@ -25,6 +26,18 @@ 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_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($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]} @@ -32,17 +45,7 @@ for k in "${!BASE_MAP[@]}"; do 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 [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then # IF it's a forked PR, we need to switch back to the PR ref/head so we can git log properly - 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_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($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 + 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 diff --git a/.travis.yml b/.travis.yml index bd9c3ee801a..915f636b9e7 100644 --- a/.travis.yml +++ b/.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 && [[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.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= From 6f6970ce27b155e3c693e4908801891f87356846 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Tue, 17 Sep 2019 12:05:01 -0400 Subject: [PATCH 8/8] change to echo --- .cicd/submodule-regression-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh index e8e9c8772cd..9befa9d0728 100755 --- a/.cicd/submodule-regression-check.sh +++ b/.cicd/submodule-regression-check.sh @@ -30,7 +30,7 @@ done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --for 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_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($TRAVIS_COMMIT)" + echo "switching back to $TRAVIS_COMMIT" echo 'git checkout -qf FETCH_HEAD' git checkout -qf FETCH_HEAD &> /dev/null elif [[ $BUILDKITE == true ]]; then