Get versioninfo from the git repository

Sets value of softwareVer during build
pull/32/head
Marcel van der Boom 6 years ago
parent bdc4f270f8
commit c25d0bef67
  1. 9
      Makefile
  2. 8
      app.go

@ -1,7 +1,10 @@
GITREV=`git describe --tags`
LDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)'"
GOCMD=go GOCMD=go
GOINSTALL=$(GOCMD) install GOINSTALL=$(GOCMD) install $(LDFLAGS)
GOBUILD=$(GOCMD) build GOBUILD=$(GOCMD) build $(LDFLAGS)
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test $(LDFLAGS)
GOGET=$(GOCMD) get GOGET=$(GOCMD) get
BINARY_NAME=writefreely BINARY_NAME=writefreely

@ -33,10 +33,12 @@ const (
serverSoftware = "WriteFreely" serverSoftware = "WriteFreely"
softwareURL = "https://writefreely.org" softwareURL = "https://writefreely.org"
softwareVer = "0.3"
) )
// Software version can be set from git env using -ldflags
var softwareVer = "v0.3"
var ( var (
debugging bool debugging bool
@ -133,7 +135,7 @@ func pageForReq(app *app, r *http.Request) page.StaticPage {
p := page.StaticPage{ p := page.StaticPage{
AppCfg: app.cfg.App, AppCfg: app.cfg.App,
Path: r.URL.Path, Path: r.URL.Path,
Version: "v" + softwareVer, Version: softwareVer,
} }
// Add user information, if given // Add user information, if given

Loading…
Cancel
Save