Makefile: re-enable tarball uploads for "master" branch

[tahoe-lafs/tahoe-lafs.git] / Makefile

diff --git a/Makefile b/Makefile
index 1f9d218c3b723a069024887c540ea57293a2e44c..cd11acb12b295f9afcbccbe3ed4e48a314d54ca0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ tmpfstest:
        time make _tmpfstest 'TMPDIR=$(shell mktemp -d --tmpdir=.)'
 
 _tmpfstest:
-       sudo mount -t tmpfs -o size=330m tmpfs '$(TMPDIR)'
+       sudo mount -t tmpfs -o size=400m tmpfs '$(TMPDIR)'
        -$(TAHOE) debug trial --rterrors '--temp-directory=$(TMPDIR)/_trial_temp' $(TRIALARGS) $(TEST)
        sudo umount '$(TMPDIR)'
        rmdir '$(TMPDIR)'
@@ -288,4 +288,4 @@ tarballs:
        $(PYTHON) setup.py sdist --sumo --formats=bztar,gztar,zip
 
 upload-tarballs:
-       @if [ "X${BB_BRANCH}" = "Xtrunk" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
+       @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi