add release version to build and display on page

ethpandaops · Aug 24, 2023 · 75d8d19 · 75d8d19
1 parent 090df72
commit 75d8d19
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 5 deletions.
diff --git a/.github/workflows/_shared-build.yaml b/.github/workflows/_shared-build.yaml
@@ -2,6 +2,12 @@
 name: Reusable build workflow
 on:
   workflow_call:
+     inputs:
+        release:
+          description: 'Release version tag for this build'
+          default: ''
+          required: false
+          type: string
 
 # shared build jobs
 jobs:
@@ -26,6 +32,8 @@ jobs:
     - name: Build linux binary
       run: |
         make linux
+      env:
+        RELEASE: ${{ inputs.release }}
 
     # upload artifacts
     - name: "Upload artifact: explorer_linux_amd64"
@@ -55,6 +63,8 @@ jobs:
     - name: Build windows binary
       run: |
         make windows
+      env:
+        RELEASE: ${{ inputs.release }}
 
     # upload artifacts
     - name: "Upload artifact: explorer_windows_amd64.exe"
@@ -84,6 +94,8 @@ jobs:
     - name: Build macos binary
       run: |
         make darwin
+      env:
+        RELEASE: ${{ inputs.release }}
 
     # upload artifacts
     - name: "Upload artifact: explorer_darwin_amd64"

diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -16,6 +16,8 @@ jobs:
   build_binaries:
     name: "Build binaries"
     uses: ./.github/workflows/_shared-build.yaml
+    with:
+      release: "snapshot"
 
   create_snapshot_release:
     name: Create snapshot release
@@ -141,6 +143,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build unstable docker image
-        run: docker build . --file Dockerfile --tag pk910/light-beaconchain-explorer:unstable
+        run: docker build . --build-arg release=snapshot --file Dockerfile --tag pk910/light-beaconchain-explorer:unstable
       - name: Push unstable docker image
         run: docker push pk910/light-beaconchain-explorer:unstable
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -12,6 +12,8 @@ jobs:
   build_binaries:
     name: "Build binaries"
     uses: ./.github/workflows/_shared-build.yaml
+    with:
+      release: "v${{ inputs.version }}"
 
   create_release:
     name: Create Release

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -23,10 +23,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build version specific docker image
-        run: docker build . --file Dockerfile --tag pk910/light-beaconchain-explorer:${{ github.event.release.tag_name }}
+        run: docker build . --build-arg release=${{ github.event.release.tag_name }} --file Dockerfile --tag pk910/light-beaconchain-explorer:${{ github.event.release.tag_name }}
       - name: Push version specific docker image
         run: docker push pk910/light-beaconchain-explorer:${{ github.event.release.tag_name }}
       - name: Build latest docker image
-        run: docker build . --file Dockerfile --tag pk910/light-beaconchain-explorer:latest
+        run: docker build . --build-arg release=${{ github.event.release.tag_name }} --file Dockerfile --tag pk910/light-beaconchain-explorer:latest
       - name: Push latest docker image
         run: docker push pk910/light-beaconchain-explorer:latest
diff --git a/Dockerfile b/Dockerfile
@@ -5,6 +5,8 @@ WORKDIR /src
 RUN go mod download
 ADD . /src
 ARG target=linux
+ARG release=
+ENV RELEASE=$release
 RUN make $target
 
 # final stage

diff --git a/Makefile b/Makefile
@@ -5,9 +5,11 @@ LINUX=$(EXECUTABLE)_linux_amd64
 DARWIN=$(EXECUTABLE)_darwin_amd64
 VERSION := $(shell git rev-parse --short HEAD)
 BUILDTIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
+VERSION := $(shell git rev-parse --short HEAD)
 
-GOLDFLAGS += -X 'github.com/pk910/light-beaconchain-explorer/utils.BuildVersion=$(VERSION)'
-GOLDFLAGS += -X 'github.com/pk910/light-beaconchain-explorer/utils.Buildtime=$(BUILDTIME)'
+GOLDFLAGS += -X 'github.com/pk910/light-beaconchain-explorer/utils.BuildVersion="$(VERSION)"'
+GOLDFLAGS += -X 'github.com/pk910/light-beaconchain-explorer/utils.Buildtime="$(BUILDTIME)"'
+GOLDFLAGS += -X 'github.com/pk910/light-beaconchain-explorer/utils.BuildRelease="$(RELEASE)"'
 
 .PHONY: all test clean
 

diff --git a/cmd/explorer/main.go b/cmd/explorer/main.go
@@ -33,6 +33,7 @@ func main() {
 	logger.WithFields(logger.Fields{
 		"config":    *configPath,
 		"version":   utils.BuildVersion,
+		"release":   utils.BuildRelease,
 		"chainName": utils.Config.Chain.Config.ConfigName}).Printf("starting")
 
 	if utils.Config.Chain.Config.SlotsPerEpoch == 0 || utils.Config.Chain.Config.SecondsPerSlot == 0 {

diff --git a/handlers/pageData.go b/handlers/pageData.go
@@ -53,6 +53,12 @@ func InitPageData(w http.ResponseWriter, r *http.Request, active, path, title st
 		MainMenuItems:         createMenuItems(active, isMainnet),
 	}
 
+	if utils.BuildRelease == "" {
+		data.Version = fmt.Sprintf("git-%v", utils.BuildVersion)
+	} else {
+		data.Version = fmt.Sprintf("%v (git-%v)", utils.BuildRelease, utils.BuildVersion)
+	}
+
 	acceptedLangs := strings.Split(r.Header.Get("Accept-Language"), ",")
 	if len(acceptedLangs) > 0 {
 		if strings.Contains(acceptedLangs[0], "ru") || strings.Contains(acceptedLangs[0], "RU") {

diff --git a/utils/buildinfo.go b/utils/buildinfo.go
@@ -1,4 +1,5 @@
 package utils
 
 var BuildVersion string
+var BuildRelease string
 var Buildtime string