Use vendorless mode for workspace status (istio#16723)

mfilipiak-ccg · Aug 31, 2019 · 802bd75 · 802bd75
1 parent 4d0524d
commit 802bd75
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/bin/get_workspace_status.sh b/bin/get_workspace_status.sh
@@ -43,20 +43,10 @@ fi
 GIT_DESCRIBE_TAG=$(git describe --tags)
 
 # used by bin/gobuild.sh
-if [ "${GO111MODULE}" == "on" ]; then
-  echo "istio.io/pkg/version.buildVersion=${VERSION}"
-  echo "istio.io/pkg/version.buildGitRevision=${BUILD_GIT_REVISION}"
-  echo "istio.io/pkg/version.buildUser=$(whoami)"
-  echo "istio.io/pkg/version.buildHost=$(hostname -f)"
-  echo "istio.io/pkg/version.buildDockerHub=${DOCKER_HUB}"
-  echo "istio.io/pkg/version.buildStatus=${tree_status}"
-  echo "istio.io/pkg/version.buildTag=${GIT_DESCRIBE_TAG}"
-else
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildVersion=${VERSION}"
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildGitRevision=${BUILD_GIT_REVISION}"
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildUser=$(whoami)"
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildHost=$(hostname -f)"
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildDockerHub=${DOCKER_HUB}"
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildStatus=${tree_status}"
-  echo "istio.io/istio/vendor/istio.io/pkg/version.buildTag=${GIT_DESCRIBE_TAG}"
-fi
+echo "istio.io/pkg/version.buildVersion=${VERSION}"
+echo "istio.io/pkg/version.buildGitRevision=${BUILD_GIT_REVISION}"
+echo "istio.io/pkg/version.buildUser=$(whoami)"
+echo "istio.io/pkg/version.buildHost=$(hostname -f)"
+echo "istio.io/pkg/version.buildDockerHub=${DOCKER_HUB}"
+echo "istio.io/pkg/version.buildStatus=${tree_status}"
+echo "istio.io/pkg/version.buildTag=${GIT_DESCRIBE_TAG}"