diff --git a/Makefile b/Makefile index 79aa8d061..bb6ca11e8 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ update: GO111MODULE=on go tidy GO111MODULE=on go vendor -doc: rclone.1 MANUAL.html MANUAL.txt +doc: rclone.1 MANUAL.html MANUAL.txt rcdocs commanddocs rclone.1: MANUAL.md pandoc -s --from markdown --to man MANUAL.md -o rclone.1 @@ -194,12 +194,9 @@ ifndef BRANCH_PATH endif @echo Beta release ready at $(BETA_URL) -# Fetch the windows builds from appveyor -fetch_windows: - rclone -v copy --include 'rclone-v*-windows-*.zip' $(BETA_UPLOAD) build/ - -#cp -av build/rclone-v*-windows-386.zip build/rclone-current-windows-386.zip - -#cp -av build/rclone-v*-windows-amd64.zip build/rclone-current-windows-amd64.zip - md5sum build/rclone-*-windows-*.zip | sort +# Fetch the binary builds from travis and appveyor +fetch_binaries: + rclone -v sync $(BETA_UPLOAD) build/ serve: website cd docs && hugo server -v -w diff --git a/RELEASE.md b/RELEASE.md index 9195e5aea..10c890b09 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -13,14 +13,9 @@ Making a release * git status - to check for new man pages - git add them * git commit -a -v -m "Version v1.XX" * make retag - * make release_dep - * # Set the GOPATH for a current stable go compiler - * make cross - * git checkout docs/content/commands # to undo date changes in commands * git push --tags origin master - * git push --tags origin master:stable # update the stable branch for packager.io - * # Wait for the appveyor and travis builds to complete then fetch the windows binaries from appveyor - * make fetch_windows + * # Wait for the appveyor and travis builds to complete then... + * make fetch_binaries * make tarball * make sign_upload * make check_sign @@ -31,11 +26,8 @@ Making a release * # announce with forum post, twitter post, G+ post Early in the next release cycle update the vendored dependencies - * Review any pinned packages in Gopkg.toml and remove if possible + * Review any pinned packages in go.mod and remove if possible * make update * git status * git add new files - * carry forward any patches to vendor stuff * git commit -a -v - -Make the version number be just in a file?