From 4011c02fcc9b2b9aee8115af1f0007272c6daf3c Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 7 Jun 2022 10:48:28 -0400 Subject: [PATCH] Cirrus: Avoid build-each-commit check This check is breaking on PRs and branches, for example: ``` Rebasing (5/24) error: could not apply e6ed1d4bf... cirrus: update image Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply e6ed1d4bf... cirrus: update image Auto-merging .cirrus.yml CONFLICT (content): Merge conflict in .cirrus.yml make: *** [Makefile:269: build-all-new-commits] Error 1 ``` Stop running this check rather than debugging/fixing it because this is a release branch that will not likely ever see a PR containing more than one commit. Signed-off-by: Chris Evich --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2da7ed3125..919563d9d7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -303,8 +303,8 @@ alt_build_task: TEST_FLAVOR: "altbuild" gce_instance: *standardvm matrix: - - env: - ALT_NAME: 'Build Each Commit' + #- env: + # ALT_NAME: 'Build Each Commit' - env: ALT_NAME: 'Windows Cross' - env: