aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2018-05-24 22:32:31 +1200
committerAldo Cortesi <aldo@nullcube.com>2018-05-24 22:32:31 +1200
commite9b19dba8aa204ead6092fbb901dadb5be8df72a (patch)
tree04a703fb2859401af938e56ce6447ac7c7e08a1f /release
parentc91b511bc7cca6a04237d30db1845ddc232aff64 (diff)
downloadmitmproxy-e9b19dba8aa204ead6092fbb901dadb5be8df72a.tar.gz
mitmproxy-e9b19dba8aa204ead6092fbb901dadb5be8df72a.tar.bz2
mitmproxy-e9b19dba8aa204ead6092fbb901dadb5be8df72a.zip
cibuild: fix docker upload condition, expand tests
Diffstat (limited to 'release')
-rwxr-xr-xrelease/cibuild.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/cibuild.py b/release/cibuild.py
index f3101269..9d99d8d9 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -197,11 +197,11 @@ class BuildEnviron:
@property
def should_upload_docker(self) -> bool:
- return (
- (self.tag or self.branch == "master") and
+ return all([
+ (self.tag or self.branch == "master"),
self.should_build_docker,
self.has_docker_creds,
- )
+ ])
@property
def should_upload_pypi(self) -> bool: