From 065562a7de4d75e50c30c9d543a57818b43a03e9 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 6 Jun 2019 21:43:14 -0700 Subject: [PATCH] more attempts to auto-update Signed-off-by: Jeff Carr --- Makefile | 5 ++++- build/main.go | 26 +++++--------------------- resources/VERSION | 2 +- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index fca441c..bfd2946 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,10 @@ push: -git commit -a -s git push --all -tag-version: build +tag-version: + # git push --delete origin v0.6.15 + rm cloud-control-panel + make build git tag v${VERSION} git push --tags # https://mirrors.wit.com/cloud/control-panel/ diff --git a/build/main.go b/build/main.go index a866fed..606da17 100644 --- a/build/main.go +++ b/build/main.go @@ -22,13 +22,7 @@ var builddir string var homedir string func main() { - // os.Chdir("~/go/src/wit/cloud-control-panel") - - // set epoch, version, - // set build cloud-control-panel - - // get build time - // go build -ldflags + // set build -ldflags for windows and macos // " // -X main.GITCOMMIT=${GITCOMMIT} // -X main.GOVERSION='${GOVERSION}' @@ -38,20 +32,6 @@ func main() { // upload binary to mirrors.wit.com/cloud/control-panel - - setupUser() - - log.Println("homedir", homedir) - log.Println("builddir", builddir) - log.Println("filename", filename) - - shell.Run("pwd") - s, _ := os.Getwd() - log.Println("Getwd()", s) - os.Chdir(builddir) - log.Println("Getwd()", s) - shell.Run("pwd") - for { build() os.Exit(0) @@ -61,6 +41,10 @@ func main() { func build() { + tags := shell.Run("git tag --list") + log.Println(tags) + os.Exit(0) + // shell.SetDelayInMsec(50) shell.Run("go get -v .") diff --git a/resources/VERSION b/resources/VERSION index 33ac520..d15dfad 100644 --- a/resources/VERSION +++ b/resources/VERSION @@ -1 +1 @@ -0.6.21 +0.6.22