summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2018-12-19 15:09:35 -0500
committerChris Evich <cevich@redhat.com>2018-12-19 15:09:35 -0500
commita15328b0e99331279ca52ad71ce9011df0708395 (patch)
tree44efec5cf7db2962c81f1d9ab793850d1dc81f81
parenteddfe6ba628d17435559ba32a8ef748c386105aa (diff)
downloadpodman-a15328b0e99331279ca52ad71ce9011df0708395.tar.gz
podman-a15328b0e99331279ca52ad71ce9011df0708395.tar.bz2
podman-a15328b0e99331279ca52ad71ce9011df0708395.zip
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 <cevich@redhat.com>
-rw-r--r--.cirrus.yml3
1 files changed, 3 insertions, 0 deletions
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