From b6917ed0b7e5e77aa649c7e24a2e458034a6d50d Mon Sep 17 00:00:00 2001
From: Roee Gadot <roee.gadot@up9.com>
Date: Sun, 20 Jun 2021 08:53:12 +0300
Subject: [PATCH] no message

---
 .github/workflows/publish-cli.yml | 6 +++---
 cli/Makefile                      | 2 --
 cli/cmd/version.go                | 5 ++++-
 cli/mizu/consts.go                | 1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index 936bd09e5..2789c24cd 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -2,7 +2,8 @@ name: public-cli
 on:
   push:
     branches:
-      - my-temp-release-check
+      - develop
+      - main
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -29,12 +30,11 @@ jobs:
       - name: Get base image name
         shell: bash
         run: |
-          echo "##[set-output name=build_time_utc;]$(echo $(date -u))"
           echo "##[set-output name=build_timestamp;]$(echo $(date +%s))"
           echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
         id: version_parameters
       - name: Build and Push CLI
-        run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIME_UTC='${{ steps.version_parameters.outputs.build_time_utc }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}'
+        run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}'
       - name: publish
         uses: ncipollo/release-action@v1
         with:
diff --git a/cli/Makefile b/cli/Makefile
index b0d4ba8cc..2444c5c92 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -3,7 +3,6 @@ COMMIT_HASH=$(shell git rev-parse HEAD)
 GIT_BRANCH=$(shell git branch --show-current | tr '[:upper:]' '[:lower:]')
 GIT_VERSION=$(shell git branch --show-current | tr '[:upper:]' '[:lower:]')
 BUILD_TIMESTAMP=$(shell date +%s)
-BUILD_TIME_UTC=$(shell date -u)
 
 .PHONY: help
 .DEFAULT_GOAL := help
@@ -18,7 +17,6 @@ build:	## build mizu CLI binary (select platform via GOOS / GOARCH env variables
 	go build -ldflags="-X 'github.com/up9inc/mizu/cli/mizu.GitCommitHash=$(COMMIT_HASH)' \
 					   -X 'github.com/up9inc/mizu/cli/mizu.Branch=$(GIT_BRANCH)' \
 					   -X 'github.com/up9inc/mizu/cli/mizu.BuildTimestamp=$(BUILD_TIMESTAMP)' \
-					   -X 'github.com/up9inc/mizu/cli/mizu.BuildTimeUTC=$(BUILD_TIME_UTC)' \
 					   -X 'github.com/up9inc/mizu/cli/mizu.SemVer=$(SEM_VER)'" \
 					   -o bin/mizu_$(FOLDER) mizu.go && echo 'checksum for ${FOLDER}\n\t my check sum' >> bin/checksums.txt
 
diff --git a/cli/cmd/version.go b/cli/cmd/version.go
index ecd66750c..366b05da2 100644
--- a/cli/cmd/version.go
+++ b/cli/cmd/version.go
@@ -3,6 +3,8 @@ package cmd
 import (
 	"fmt"
 	"github.com/up9inc/mizu/cli/mizu"
+	"strconv"
+	"time"
 
 	"github.com/spf13/cobra"
 )
@@ -19,8 +21,9 @@ var versionCmd = &cobra.Command{
 	Short: "Print version info",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if mizuVersionOptions.DebugInfo {
+			timeStampInt, _ := strconv.ParseInt(mizu.BuildTimestamp, 10, 0)
 			fmt.Printf("Version: %s \nBranch: %s (%s) \n", mizu.SemVer, mizu.Branch, mizu.GitCommitHash)
-			fmt.Printf("Build Time: %s (%s)\n", mizu.BuildTimestamp, mizu.BuildTimeUTC)
+			fmt.Printf("Build Time: %s (%s)\n", mizu.BuildTimestamp,  time.Unix(timeStampInt, 0))
 
 		} else {
 			fmt.Printf("Version: %s (%s)\n", mizu.SemVer, mizu.Branch)
diff --git a/cli/mizu/consts.go b/cli/mizu/consts.go
index a01e8ddb5..9f72620ad 100644
--- a/cli/mizu/consts.go
+++ b/cli/mizu/consts.go
@@ -4,7 +4,6 @@ var (
 	SemVer         = "0.0.1"
 	Branch         = "develop"
 	GitCommitHash  = "" // this var is overridden using ldflags in makefile when building
-	BuildTimeUTC   = "" // this var is overridden using ldflags in makefile when building
 	BuildTimestamp = "" // this var is overridden using ldflags in makefile when building
 	RBACVersion    = "v1"
 )