Fix versioning problem

RashadAnsari · Jul 11, 2021 · fe24176 · fe24176
1 parent 6b05493
commit fe24176
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,5 @@
-export APP=gola
-export APP_VERSION=v0.0.0
 export BUILD_INFO_PKG="github.com/RashadAnsari/gola/pkg/version"
-export LDFLAGS="-w -s -X '$(BUILD_INFO_PKG).AppVersion=$(APP_VERSION)' -X '$(BUILD_INFO_PKG).Date=$$(date)' -X '$(BUILD_INFO_PKG).BuildVersion=$$(git rev-parse HEAD | cut -c 1-8)' -X '$(BUILD_INFO_PKG).VCSRef=$$(git rev-parse --abbrev-ref HEAD)'"
+export LDFLAGS="-w -s -X '$(BUILD_INFO_PKG).AppVersion=dev' -X '$(BUILD_INFO_PKG).Date=$$(date)' -X '$(BUILD_INFO_PKG).BuildVersion=$$(git rev-parse HEAD | cut -c 1-8)' -X '$(BUILD_INFO_PKG).VCSRef=$$(git rev-parse --abbrev-ref HEAD)'"
 
 binary:
 	@go build -ldflags $(LDFLAGS) ./cmd/gola
@@ -10,7 +8,7 @@ install:
 	@go install -ldflags $(LDFLAGS) ./cmd/gola
 
 release:
-	@./scripts/release.sh $(APP) $(APP_VERSION) "$(LDFLAGS)"
+	@./scripts/release.sh $(APP_VERSION)
 
 format:
 	@find . -type f -name '*.go' -not -path './vendor/*' -exec gofmt -s -w {} +

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-APP=$1
-APP_VERSION=$2
-LDFLAGS=$3
+APP=gola
+
+APP_VERSION=$1
+
+BUILD_INFO_PKG="github.com/RashadAnsari/gola/pkg/version"
+LDFLAGS="-w -s -X '${BUILD_INFO_PKG}.AppVersion=${APP_VERSION}' -X '${BUILD_INFO_PKG}.Date=$(date)' -X '${BUILD_INFO_PKG}.BuildVersion=$(git rev-parse HEAD | cut -c 1-8)' -X '${BUILD_INFO_PKG}.VCSRef=$(git rev-parse --abbrev-ref HEAD)'"
 
 RELEASE_FOLDER=releases
 
 function release {
     GO_OS=$1
     GO_ARCH=$2
 
-    GOOS=${GO_OS} GOARCH=${GO_ARCH} go build -ldflags "${LDFLAGS}"  ./cmd/${APP}
+    GOOS=${GO_OS} GOARCH=${GO_ARCH} go build -ldflags "${LDFLAGS}" ./cmd/${APP}
 
     BINARY_NAME=${APP}-${APP_VERSION}-${GO_OS}-${GO_ARCH}
     mv ${APP} ${BINARY_NAME}