From 4bc136422483a870e40b6c0b59799df861c955be Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 27 Aug 2014 14:04:54 -0700 Subject: [PATCH] Fix commitFromGit -> gitCommit in release/build-release.sh This caused Jenkins break on e2e-test because the version of server and client did not match exactly, as the server was built without the version ldflags. Tested: - Ran "release/build-release.sh ${instance_name}" and confirmed that output/release/master-release/src/saltbase/pillar/common.sls has the git version under version.gitCommit no longer version.commitFromGit. Fixes: b777eb19e25240520b5122de299d9ee270c76017 --- release/build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/build-release.sh b/release/build-release.sh index ca06c21e60a..71c87b892b9 100755 --- a/release/build-release.sh +++ b/release/build-release.sh @@ -49,7 +49,7 @@ version=$( cat << EOF > $MASTER_RELEASE_DIR/src/saltbase/pillar/common.sls instance_prefix: $INSTANCE_PREFIX-minion -go_opt: -ldflags "-X github.com/GoogleCloudPlatform/kubernetes/pkg/version.commitFromGit '$version'" +go_opt: -ldflags "-X github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitCommit '$version'" EOF function find_go_files() {