From 40d72df91f6f4555d1cf106aa798245ea6453af4 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Fri, 18 Dec 2020 13:27:35 +0100 Subject: [PATCH] static_tests.sh: only default to master when not in a GitHub action --- dist/tools/ci/static_tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dist/tools/ci/static_tests.sh b/dist/tools/ci/static_tests.sh index bae2eaa36d..b9f701a9ea 100755 --- a/dist/tools/ci/static_tests.sh +++ b/dist/tools/ci/static_tests.sh @@ -95,7 +95,11 @@ if [ -n "${CI_BASE_COMMIT}" ]; then git tag "${CI_BASE_BRANCH}" "${CI_BASE_COMMIT}" fi -CI_BASE_BRANCH=${CI_BASE_BRANCH:-master} +if [ -z "${GITHUB_RUN_ID}" ]; then + # only default to master when not running in a GitHub action + # (so GitHub can check release branches too) + CI_BASE_BRANCH=${CI_BASE_BRANCH:-master} +fi export BASE_BRANCH="${CI_BASE_BRANCH}"