From b1789ce0557f02e0b54f2e9c0798f1cda652b120 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 7 Jun 2019 10:45:41 -0700 Subject: [PATCH] upload the builddate file Signed-off-by: Jeff Carr --- autobuild/autobuild.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/autobuild/autobuild.go b/autobuild/autobuild.go index b9073db..2cfb9d6 100644 --- a/autobuild/autobuild.go +++ b/autobuild/autobuild.go @@ -84,12 +84,12 @@ func build(tag string) *bool { shell.Run("git checkout v" + tag) gitref := shell.Run("git rev-list -1 HEAD") - tagref := shell.Run("cat .git/refs/tags/v" + tag) + tagref := shell.Run("cat .git/refs/tags/v" + tag) // what is the right way? if (gitref != tagref) { - log.Println("\tJESUS.", gitref, "ne", tagref) - os.Exit(-1) - return nil + log.Println("\tJESUS HOW TO DO THIS CORRECTLY?", gitref, "ne", tagref) + // os.Exit(-1) + // return nil } shell.Run("rm cloud-control-panel") shell.Run("go build") @@ -136,9 +136,9 @@ func setbuilddir() { func upload(tag string) { mirrors := "root@mirrors.wit.com:/data/mirrors/cloud/control-panel/linux/" - shell.Run("scp resources/VERSION " + mirrors) - shell.Run("scp resources/BUILDDATE " + mirrors) - shell.Run("scp cloud-control-panel " + mirrors) - shell.Run("scp cloud-control-panel " + mirrors + "cloud-control-panel-v" + tag) - shell.Run("scp /tmp/autobuild.md5sum " + mirrors + "cloud-control-panel-v" + tag + ".md5sum") + shell.Run("scp resources/VERSION " + mirrors) + shell.Run("scp cloud-control-panel " + mirrors) + shell.Run("scp resources/BUILDDATE " + mirrors + filename + "-v" + tag + ".BUILDDATE") + shell.Run("scp cloud-control-panel " + mirrors + filename + "-v" + tag) + shell.Run("scp /tmp/autobuild.md5sum " + mirrors + filename + "-v" + tag + ".md5sum") }