From 29c0c08fd4abc34aae4e1bf579cc506eaabef428 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 1 Apr 2020 11:07:34 -0700 Subject: [PATCH] ci: do full sanitycheck if not a PR Cover the cases where we run sanitycheck on a merged PR. Signed-off-by: Anas Nashif --- scripts/ci/run_ci.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/ci/run_ci.sh b/scripts/ci/run_ci.sh index 8fbb5416464..20cf241c591 100755 --- a/scripts/ci/run_ci.sh +++ b/scripts/ci/run_ci.sh @@ -221,16 +221,20 @@ if [ -n "$main_ci" ]; then # Possibly the only record of what exact version is being tested: short_git_log='git log -n 5 --oneline --decorate --abbrev=12 ' + # check what files have changed. + SC=`./scripts/ci/what_changed.py --commits ${commit_range}` + if [ -n "$pull_request_nr" ]; then $short_git_log $remote/${branch} # Now let's pray this script is being run from a # different location # https://stackoverflow.com/questions/3398258/edit-shell-script-while-its-running git rebase $remote/${branch} + else + SC="full" fi $short_git_log - SC=`./scripts/ci/what_changed.py --commits ${commit_range}` if [ -n "${BSIM_OUT_PATH}" -a -d "${BSIM_OUT_PATH}" -a "$SC" == "full" ]; then echo "Build and run BT simulator tests"