From 27e084af68c7ff166abb1ad123930b9c3de403e2 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Feb 09 2021 17:22:29 +0000 Subject: Change master to main in runtest Signed-off-by: Tomas Hrcka --- diff --git a/run_tests.sh b/run_tests.sh index bc1fc82..2fa3f4c 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -35,11 +35,11 @@ if [ "$BRANCH_TO" != "None" -a "$BRANCH_TO" != "" ]; then # If this branch is atop the master, use its tests (possibly updated). # Otherwise, check out origin/master for the latest tests. set +e - git merge-base --is-ancestor -- origin/master HEAD + git merge-base --is-ancestor -- origin/main HEAD ret=$? set -e if [ $ret -ne 0 ]; then - git checkout origin/master + git checkout origin/main fi # Run any tests that only apply to PRs @@ -52,7 +52,7 @@ git reset --hard $MODULE_DEFAULTS_TEST_UPDATED # Otherwise, check out origin/master for the latest tests. TEMPDIR= set +e -git merge-base --is-ancestor -- origin/master HEAD +git merge-base --is-ancestor -- origin/main HEAD ret=$? set -e if [ $ret -ne 0 ]; then