From 723945abcd6b9c63fe80fd88d8d3a1456539db4d Mon Sep 17 00:00:00 2001 From: codeskyblue Date: Sat, 12 Aug 2017 16:39:59 +0800 Subject: [PATCH] add goreleaser --- .goreleaser.yml | 5 +++++ .travis.yml | 20 ++++---------------- cmds.go | 2 +- gosuv.go | 4 ++-- res_bindata.go | 42 ------------------------------------------ web.go | 2 +- 6 files changed, 13 insertions(+), 62 deletions(-) create mode 100644 .goreleaser.yml delete mode 100644 res_bindata.go diff --git a/.goreleaser.yml b/.goreleaser.yml new file mode 100644 index 0000000..d136ce8 --- /dev/null +++ b/.goreleaser.yml @@ -0,0 +1,5 @@ +builds: + - + flags: -tags vfs + hooks: + pre: go generate \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6a1a9a7..82645c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,10 @@ language: go sudo: false go: - 1.7 -before_install: -- openssl aes-256-cbc -K $encrypted_6219389dc5b7_key -iv $encrypted_6219389dc5b7_iv - -in equinox.key.enc -out equinox.key -d -before_script: +install: - go get -v -- go generate script: - go test -v -before_deploy: | - echo "Skip" -env: - global: - secure: H5IcPyLA9JBgHZZL8sb/7gFY68284VvOUnsAeZcbgpFupIv8iaGgvql5NVnvwovD/SxFWlZ8z4X2BdQWtgURQ1Tr6oLrsTZWZi4Pr5eKhXyCElgZmSP+z8YuUMYs37/uM/iKH/D7vmJlwpoHGJDFbZ0QC5t/W48gyeC0JuAkY05/mqgGCs0/T+yq7YyCvaogZyJhqY2Xq3y3zlleMxYPMkpLsm48JEPtPGoWV6cbXYZHn1FWYAK9w2yKhw+je6EGiAPxT4W9pTWxAHlmvuByPcN2QS2AvgmTkMeYo8KzwOCWTDBwtWU9mjmKerC5EvSwpvhXq77zstorUUxUBWUiJpZnRg+o86M900WLE6x813niLc4KFUXm6wQP9laLgcDkPkSZ9me/TXDcogGgjFXkw1HFsbq4I41b8YuZmiYCkoHvZI68TfkKqSVZ2jp+j7wBxidFlRZO2BJQC4YsX7SJlFDBgOIcyEPNjiZiCFcIa+USHX9AfUyERoP+FBI9cCtki433fVTXInNDu43+GO8C7Jr+0ULDjPGJSWXXU5/+mApXTsDPwUSZ1RE3VxiO2evxmigajqicH0kJbd70JZNqlTaSBgNbgFTiWU0auKJFsnIdSu8BtJ+Neg8isWJ/j2ItbX4Ci4zSIy9JaN2IY8CuLRGLZbiVe5hKbVVNQMGqxMI= -deploy: - - provider: script - skip_cleanup: true - script: ./deploy.sh - on: - branch: master +after_success: + - test -n "$TRAVIS_TAG" && curl -sL https://git.io/goreleaser | bash + - test -z "$TRAVIS_TAG" && curl -sL https://git.io/goreleaser | bash -s -- --snapshot \ No newline at end of file diff --git a/cmds.go b/cmds.go index edf36ca..0489311 100644 --- a/cmds.go +++ b/cmds.go @@ -176,7 +176,7 @@ func actionEdit(c *cli.Context) error { } func actionVersion(c *cli.Context) error { - fmt.Printf("gosuv version %s\n", Version) + fmt.Printf("gosuv version %s\n", version) return nil } diff --git a/gosuv.go b/gosuv.go index 1791511..3392d25 100644 --- a/gosuv.go +++ b/gosuv.go @@ -17,7 +17,7 @@ import ( const appID = "app_8Gji4eEAdDx" var ( - Version string = "dev" + version string = "master" publicKey = []byte(` -----BEGIN ECDSA PUBLIC KEY----- MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEY8xsSkcFs8XXUicw3n7E77qN/vqKUQ/6 @@ -94,7 +94,7 @@ func main() { app := cli.NewApp() app.Name = "gosuv" - app.Version = Version + app.Version = version app.Usage = "golang port of python-supervisor" app.Before = func(c *cli.Context) error { var err error diff --git a/res_bindata.go b/res_bindata.go deleted file mode 100644 index 1a951a3..0000000 --- a/res_bindata.go +++ /dev/null @@ -1,42 +0,0 @@ -// +build bindata - -package main - -import ( - "html/template" - "io" - "log" - "net/http" - "path/filepath" -) - -var tmpl *template.Template - -func parseTemplate(name string, content string) { - if tmpl == nil { - tmpl = template.New(name) - } - var t *template.Template - if tmpl.Name() == name { - t = tmpl - } else { - t = tmpl.New(name) - } - template.Must(t.New(name).Delims("[[", "]]").Parse(content)) -} - -func init() { - http.Handle("/res/", http.StripPrefix("/res/", Assets)) -} - -func executeTemplate(wr io.Writer, name string, data interface{}) { - if tmpl == nil || tmpl.Lookup(name) == nil { - path := filepath.Join(templateDir, name+".html") - data, err := Asset(path) - if err != nil { - log.Fatal(err) - } - parseTemplate(name, string(data)) - } - tmpl.ExecuteTemplate(wr, name, data) -} diff --git a/web.go b/web.go index 9ecc2c7..ad73122 100644 --- a/web.go +++ b/web.go @@ -245,7 +245,7 @@ func (s *Supervisor) renderHTML(w http.ResponseWriter, name string, data interfa if data == nil { wc := WebConfig{} - wc.Version = Version + wc.Version = version user, err := user.Current() if err == nil { wc.User = user.Username