Merge pull request #609 from k82cn/vc_449

Fixed build error of release-pkg.

.travis.yml

@@ -51,7 +51,9 @@ jobs:
         - echo "publish release to github & dockerhub"
       deploy:
         - provider: script
-          script: make TAG=${TRAVIS_TAG} RELEASE_VER=${TRAVIS_TAG} release
+          script:
+            - make TAG=${TRAVIS_TAG} RELEASE_VER=${TRAVIS_TAG} release-env
+            - make TAG=${TRAVIS_TAG} RELEASE_VER=${TRAVIS_TAG} release
           on:
             tags: true
         - provider: releases

Makefile

@@ -17,15 +17,9 @@ RELEASE_DIR=_output/release
 REL_OSARCH=linux/amd64
 REPO_PATH=volcano.sh/volcano
 IMAGE_PREFIX=volcanosh/vc
-# If tag not explicitly set in users default to the git sha.
-TAG ?= $(shell git rev-parse --verify HEAD)
 RELEASE_VER=v0.2
-GitSHA=`git rev-parse HEAD`
-Date=`date "+%Y-%m-%d %H:%M:%S"`
-LD_FLAGS=" \
-    -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
-    -X '${REPO_PATH}/pkg/version.Built=${Date}'   \
-    -X '${REPO_PATH}/pkg/version.Version=${RELEASE_VER}'"
+
+include Makefile.def
 
 .EXPORT_ALL_VARIABLES:
 
@@ -77,6 +71,11 @@ e2e-test-kind:
 generate-yaml: init
 	./hack/generate-yaml.sh
 
+release-env:
+	./hack/build-env.sh release
+
+dev-env:
+	./hack/build-env.sh dev
 
 release: images generate-yaml
 	./hack/publish.sh

Makefile.def

@@ -0,0 +1,10 @@
+
+# If tag not explicitly set in users default to the git sha.
+TAG ?= $(shell git rev-parse --verify HEAD)
+GitSHA=`git rev-parse HEAD`
+Date=`date "+%Y-%m-%d %H:%M:%S"`
+LD_FLAGS=" \
+    -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
+    -X '${REPO_PATH}/pkg/version.Built=${Date}'   \
+    -X '${REPO_PATH}/pkg/version.Version=${RELEASE_VER}'"
+

defs/Makefile.dev.def

@@ -0,0 +1,10 @@
+
+# If tag not explicitly set in users default to the git sha.
+TAG ?= $(shell git rev-parse --verify HEAD)
+GitSHA=`git rev-parse HEAD`
+Date=`date "+%Y-%m-%d %H:%M:%S"`
+LD_FLAGS=" \
+    -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
+    -X '${REPO_PATH}/pkg/version.Built=${Date}'   \
+    -X '${REPO_PATH}/pkg/version.Version=${RELEASE_VER}'"
+

defs/Makefile.release.def

@@ -0,0 +1,10 @@
+
+# If tag not explicitly set in users default to the git sha.
+TAG=__release_ver__
+GitSHA=__git_sha__
+Date=`date "+%Y-%m-%d %H:%M:%S"`
+LD_FLAGS=" \
+    -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
+    -X '${REPO_PATH}/pkg/version.Built=${Date}'   \
+    -X '${REPO_PATH}/pkg/version.Version=${RELEASE_VER}'"
+

hack/build-env.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ENV=$1
+
+GitSHA=`git rev-parse HEAD`
+
+cp defs/Makefile.${ENV}.def Makefile.def
+
+sed -i "s/__git_sha__/"${GitSHA}"/g" Makefile.def
+sed -i "s/__release_ver__/"${RELEASE_VER}"/g" Makefile.def