From 86cc9f3dfbbcb8e4b7839e2402692df4c206766e Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 20 Feb 2017 17:08:07 +0000 Subject: [PATCH] Include git-log.txt into beta releases - fixes #1047 --- Makefile | 3 ++- bin/cross-compile.go | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 09c4c0dd2..68304e04b 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,8 @@ beta: @echo Beta release ready at http://pub.rclone.org/$(TAG)%CE%B2/ travis_beta: - go run bin/cross-compile.go -release latest-beta $(TAG)β + git log $(LAST_TAG).. > /tmp/git-log.txt + go run bin/cross-compile.go -release beta-latest -git-log /tmp/git-log.txt $(TAG)β rclone --config bin/travis.rclone.conf -v copy build/ memstore:beta-rclone-org/$(TAG) @echo Beta release ready at $(BETA_URL) diff --git a/bin/cross-compile.go b/bin/cross-compile.go index febae5a6b..ae701ba46 100644 --- a/bin/cross-compile.go +++ b/bin/cross-compile.go @@ -21,6 +21,7 @@ var ( debug = flag.Bool("d", false, "Print commands instead of running them.") parallel = flag.Int("parallel", runtime.NumCPU(), "Number of commands to run in parallel.") copyAs = flag.String("release", "", "Make copies of the releases with this name") + gitLog = flag.String("git-log", "", "git log to include as well") ) // GOOS/GOARCH pairs we build for @@ -98,6 +99,9 @@ func compileArch(version, goos, goarch, dir string) { run("cp", "-a", "../MANUAL.txt", filepath.Join(dir, "README.txt")) run("cp", "-a", "../MANUAL.html", filepath.Join(dir, "README.html")) run("cp", "-a", "../rclone.1", dir) + if *gitLog != "" { + run("cp", "-a", *gitLog, dir) + } zip := dir + ".zip" run("zip", "-r9", zip, dir) if *copyAs != "" {