set app version from git tag (#55)

xdbchain · Aug 4, 2023 · ca6019f · ca6019f
1 parent d488ffb
commit ca6019f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,6 +84,7 @@ jobs:
           extra_files: README.md
           release_tag: ${{ steps.previoustag.outputs.tag }}
           goversion: "go.mod"
+          ldflags: -X "github.com/xdbfoundation/go/support/app.version=${{ steps.previoustag.outputs.tag }}"
           overwrite: "true"
           retry: 100
 
@@ -131,6 +132,7 @@ jobs:
           extra_files: README.md
           release_tag: ${{ steps.previoustag.outputs.tag }}
           goversion: "go.mod"
+          ldflags: -X "github.com/xdbfoundation/go/support/app.version=${{ steps.previoustag.outputs.tag }}"
           overwrite: "true"
           retry: 100
 
@@ -148,6 +150,7 @@ jobs:
           extra_files: README.md
           release_tag: ${{ steps.previoustag.outputs.tag }}
           goversion: "go.mod"
+          ldflags: -X "github.com/xdbfoundation/go/support/app.version=${{ steps.previoustag.outputs.tag }}"
           overwrite: "true"
           retry: 100
 
@@ -165,6 +168,7 @@ jobs:
           extra_files: README.md
           release_tag: ${{ steps.previoustag.outputs.tag }}
           goversion: "go.mod"
+          ldflags: -X "github.com/xdbfoundation/go/support/app.version=${{ steps.previoustag.outputs.tag }}"
           overwrite: "true"
           retry: 100
 
@@ -201,8 +205,8 @@ jobs:
           export GO111MODULE=on
           go env -w GOBIN=/home/runner/go/bin
           sudo cp -Rf ./* /go/src/github.com/xdbfoundation/go/
-          sudo go install github.com/xdbfoundation/go/services/...
-          sudo go install github.com/xdbfoundation/go/tools/digitalbits-archivist
+          sudo go install -ldflags="-X 'github.com/xdbfoundation/go/support/app.version=${{ steps.previoustag.outputs.tag }}'" github.com/xdbfoundation/go/services/...
+          sudo go install -ldflags="-X 'github.com/xdbfoundation/go/support/app.version=${{ steps.previoustag.outputs.tag }}'" github.com/xdbfoundation/go/tools/digitalbits-archivist
           
       - name: Make .deb package
         run: |

diff --git a/services/frontier/docker/Dockerfile b/services/frontier/docker/Dockerfile
@@ -1,11 +1,12 @@
 FROM golang:1.17 AS builder
 
 WORKDIR /go/src/github.com/xdbfoundation/go
+ARG FRONTIER_VERSION
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . ./
-RUN go install github.com/xdbfoundation/go/services/frontier
-RUN go install github.com/xdbfoundation/go/exp/services/captivecore
+RUN go install -ldflags="-X 'github.com/xdbfoundation/go/support/app.version=$FRONTIER_VERSION'" github.com/xdbfoundation/go/services/frontier
+RUN go install -ldflags="-X 'github.com/xdbfoundation/go/support/app.version=$FRONTIER_VERSION'" github.com/xdbfoundation/go/exp/services/captivecore
 
 FROM ubuntu:20.04
 ENV DIGITALBITS_CORE_BINARY_PATH /usr/local/bin/digitalbits-core

diff --git a/services/frontier/docker/Dockerfile.dev b/services/frontier/docker/Dockerfile.dev
@@ -1,11 +1,12 @@
 FROM golang:1.17 AS builder
 
 WORKDIR /go/src/github.com/xdbfoundation/go
+ARG FRONTIER_VERSION
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . ./
-RUN go install github.com/xdbfoundation/go/services/frontier
-RUN go install github.com/xdbfoundation/go/exp/services/captivecore
+RUN go install -ldflags="-X 'github.com/xdbfoundation/go/support/app.version=$FRONTIER_VERSION'" github.com/xdbfoundation/go/services/frontier
+RUN go install -ldflags="-X 'github.com/xdbfoundation/go/support/app.version=$FRONTIER_VERSION'" github.com/xdbfoundation/go/exp/services/captivecore
 
 FROM ubuntu:20.04
 ENV DIGITALBITS_CORE_VERSION=1.0.65-beta.5

diff --git a/support/app/main.go b/support/app/main.go
@@ -2,13 +2,20 @@
 // provide global application metadata, such as build time or version.
 package app
 
-import "time"
-import "github.com/xdbfoundation/go/support/errors"
+import (
+	"time"
+
+	"github.com/xdbfoundation/go/support/errors"
+)
 
 var (
 	// ErrNoBuildTime is the error returned when no build time for the current
 	// binary was set.
 	ErrNoBuildTime = errors.New("build time not known")
+
+	// buildTime and version variables are now exported, so they can be set via linker flags.
+	buildTime string
+	version   string
 )
 
 // BuildTime returns the time that the binary of the current process was built.
@@ -36,8 +43,3 @@ func Version() string {
 
 	return version
 }
-
-var (
-	buildTime string
-	version   string
-)