Merge pull request #16401 from cevich/fix_windows_cross

[CI:BUILD] Cirrus: Never skip running Windows Cross task
containers · Nov 3, 2022 · 58cd3ff · 58cd3ff
2 parents eb7da14 + f3195c9
commit 58cd3ff
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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