aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-03-08 08:18:26 +1300
committerAldo Cortesi <aldo@corte.si>2018-03-08 08:18:26 +1300
commit3a3299bc612218d5073f423a587f9d917868aeec (patch)
tree595ee0aee142492f37fdd8359c181d470d639368 /release
parent5cea2aacb233f2c3144bd8c42d64161ad3241f3b (diff)
downloadmitmproxy-3a3299bc612218d5073f423a587f9d917868aeec.tar.gz
mitmproxy-3a3299bc612218d5073f423a587f9d917868aeec.tar.bz2
mitmproxy-3a3299bc612218d5073f423a587f9d917868aeec.zip
release: put branches in /branches on the snapshots server
This is a precautionary measure to prevent a clash in case we have a branch with the same name as a tag. Tags live in the top-level directory, because these are releases that users will most often access directly.
Diffstat (limited to 'release')
-rwxr-xr-xrelease/ci.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/release/ci.py b/release/ci.py
index 43fde3dc..eaabaf3a 100755
--- a/release/ci.py
+++ b/release/ci.py
@@ -74,8 +74,10 @@ TAG = os.environ.get("TRAVIS_TAG", os.environ.get("APPVEYOR_REPO_TAG_NAME", None
BRANCH = os.environ.get("TRAVIS_BRANCH", os.environ.get("APPVEYOR_REPO_BRANCH", None))
if TAG:
VERSION = TAG
+ UPLOAD_DIR = VERSION
elif BRANCH:
VERSION = BRANCH
+ UPLOAD_DIR = "branches/%s" % VERSION
else:
print("Could not establish build name - exiting." % BRANCH)
sys.exit(0)
@@ -240,7 +242,7 @@ def upload():
"aws", "s3", "cp",
"--acl", "public-read",
DIST_DIR + "/",
- "s3://snapshots.mitmproxy.org/%s/" % VERSION,
+ "s3://snapshots.mitmproxy.org/%s/" % UPLOAD_DIR,
"--recursive",
]
)