From a15328b0e99331279ca52ad71ce9011df0708395 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 19 Dec 2018 15:09:35 -0500 Subject: Cirrus: Skip build all commits test on master Fixes: git rebase origin/ -x make fatal: Needed a single revision invalid upstream 'origin/' make: *** [Makefile:351: build-all-new-commits] Error 1 By not running this test post-merge. Signed-off-by: Chris Evich --- .cirrus.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 75c9ac89e..7afd8f0b3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -103,6 +103,9 @@ build_each_commit_task: depends_on: - "gating" + # $CIRRUS_BASE_BRANCH is only set when testing a PR + only_if: $CIRRUS_BRANCH != 'master' + gce_instance: image_project: "libpod-218412" zone: "us-central1-a" # Required by Cirrus for the time being -- cgit v1.2.3-54-g00ecf