From f3195c930b834f1745b8c76c26df158c22dcfe4d Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 3 Nov 2022 15:04:09 -0400 Subject: [PATCH] Cirrus: Never skip running Windows Cross task All the other Windows tasks depend on access to a podman-remote build from the Alt. Arch. `Windows Cross` task. Re-arrange the test-skipping call to never skip here only. Signed-off-by: Chris Evich --- contrib/cirrus/runner.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index e49d1038d6..15b348f6b1 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -236,14 +236,16 @@ function _run_build() { } function _run_altbuild() { - # We can skip all these steps for test-only PRs, but not doc-only ones - _bail_if_test_can_be_skipped docs + # Subsequent windows-based tasks require a build. Var. defined in .cirrus.yml + # shellcheck disable=SC2154 + if [[ ! "$ALT_NAME" =~ Windows ]]; then + # We can skip all these steps for test-only PRs, but not doc-only ones + _bail_if_test_can_be_skipped docs + fi local -a arches local arch req_env_vars ALT_NAME - # Defined in .cirrus.yml - # shellcheck disable=SC2154 msg "Performing alternate build: $ALT_NAME" msg "************************************************************" set -x