diff --git a/Makefile b/Makefile index 11a5b8f08..ac1b65a76 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ ci_upload: find build -type l -delete gzip -r9v build ./rclone --config bin/travis.rclone.conf -v copy build/ $(BETA_UPLOAD)/testbuilds -ifndef BRANCH_PATH +ifeq ($(or $(BRANCH_PATH),$(RELEASE_TAG)),) ./rclone --config bin/travis.rclone.conf -v copy build/ $(BETA_UPLOAD_ROOT)/test/testbuilds-latest endif @echo Beta release ready at $(BETA_URL)/testbuilds @@ -215,7 +215,7 @@ ci_beta: git log $(LAST_TAG).. > /tmp/git-log.txt go run bin/cross-compile.go -release beta-latest -git-log /tmp/git-log.txt $(BUILD_FLAGS) $(BUILDTAGS) $(TAG) rclone --config bin/travis.rclone.conf -v copy --exclude '*beta-latest*' build/ $(BETA_UPLOAD) -ifndef BRANCH_PATH +ifeq ($(or $(BRANCH_PATH),$(RELEASE_TAG)),) rclone --config bin/travis.rclone.conf -v copy --include '*beta-latest*' --include version.txt build/ $(BETA_UPLOAD_ROOT)$(BETA_SUBDIR) endif @echo Beta release ready at $(BETA_URL) diff --git a/RELEASE.md b/RELEASE.md index 40c989d01..790644789 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -65,9 +65,8 @@ Now * git cherry-pick any fixes * Do the steps as above * make startstable - * NB this overwrites the current beta so we need to do this * git co master - * # cherry pick the changes to the changelog + * `#` cherry pick the changes to the changelog - check the diff to make sure it is correct * git checkout ${BASE_TAG}-stable docs/content/changelog.md * git commit -a -v -m "Changelog updates from Version ${NEW_TAG}" * git push