From 1a9f110b5976fea55e8a33ffa6d8530cd3ee3fc1 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 26 Apr 2022 11:04:53 -0400 Subject: Cirrus: Fix skipping all/most tests The originally intent for skipping tests based on change-content was to optimize the PR workflow. However, a mistake in a conditional is causing almost all tasks running for Cron and branches to be skipped. Fix this by checking for an empty '$CIRRUS_PR' variable. This value is always empty when operating outside of PRs. Signed-off-by: Chris Evich --- contrib/cirrus/runner.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib/cirrus') diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index aee9bcfbb..5d6ba9921 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -373,8 +373,9 @@ dotest() { function _bail_if_test_can_be_skipped() { local head base diffs - # Cirrus sets these for PRs but not cron. In cron, we never want to skip. - for v in CIRRUS_CHANGE_IN_REPO DEST_BRANCH; do + # Cirrus sets these for PRs but not branches or cron. In cron and branches, + #we never want to skip. + for v in CIRRUS_CHANGE_IN_REPO CIRRUS_PR; do if [[ -z "${!v}" ]]; then msg "[ _cannot do selective skip: \$$v is undefined ]" return 0 -- cgit v1.2.3-54-g00ecf