From ee8ff29e425b00d8e1628458a32d27364a33d34c Mon Sep 17 00:00:00 2001
From: Piotr Sikora <piotrsikora@google.com>
Date: Thu, 8 Aug 2019 23:22:50 -0700
Subject: [PATCH] Always publish release packages. (#2348)

Previously, 265MB release packages with debug symbols were published
instead of 9MB release packages without them.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 Makefile               |  4 ++--
 scripts/push-debian.sh | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index bf0c2320e774..ba4c8d63c13b 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,8 @@ lint:
 	@scripts/check-repository.sh
 	@scripts/check-style.sh
 
-artifacts: build
-	export PATH=$(PATH) CC=$(CC) CXX=$(CXX) && ./scripts/push-debian.sh -c opt -p $(ARTIFACTS_DIR)
+artifacts:
+	export PATH=$(PATH) CC=$(CC) CXX=$(CXX) BAZEL_BUILD_ARGS=$(BAZEL_BUILD_ARGS) && ./scripts/push-debian.sh -p $(ARTIFACTS_DIR)
 
 deb:
 	export PATH=$(PATH) CC=$(CC) CXX=$(CXX) && bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //tools/deb:istio-proxy
diff --git a/scripts/push-debian.sh b/scripts/push-debian.sh
index 79918f01624b..4fd748e7c724 100755
--- a/scripts/push-debian.sh
+++ b/scripts/push-debian.sh
@@ -23,7 +23,7 @@
 #   -p gs://istio-release/release/0.2.1/deb
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
-BAZEL_ARGS=""
+BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS}"
 BAZEL_TARGET='//tools/deb:istio-proxy'
 BAZEL_BINARY="${ROOT}/bazel-bin/tools/deb/istio-proxy"
 ISTIO_VERSION=''
@@ -36,17 +36,15 @@ set -o pipefail
 set -x
 
 function usage() {
-  echo "$0 \
-    -c <bazel config to use> \
-    -o directory to copy files \
-    -p <GCS path, e.g. gs://istio-release/release/0.2.1/deb> \
+  echo "$0
+    -o directory to copy files
+    -p <GCS path, e.g. gs://istio-release/release/0.2.1/deb>
     -v <istio version number>"
   exit 1
 }
 
-while getopts ":c:o:p:v:" arg; do
+while getopts ":o:p:v:" arg; do
   case ${arg} in
-    c) BAZEL_ARGS+=" -c ${OPTARG}";;
     o) OUTPUT_DIR="${OPTARG}";;
     p) GCS_PATH="${OPTARG}";;
     v) ISTIO_VERSION="${OPTARG}";;
@@ -55,7 +53,7 @@ while getopts ":c:o:p:v:" arg; do
 done
 
 if [[ -n "${ISTIO_VERSION}" ]]; then
-  BAZEL_ARGS+=" --action_env=ISTIO_VERSION"
+  BAZEL_BUILD_ARGS+=" --action_env=ISTIO_VERSION"
   export ISTIO_VERSION
 fi
 
@@ -67,7 +65,7 @@ fi
 BAZEL_OUT="$(bazel info output_path)/k8-opt/bin"
 BAZEL_BINARY="${BAZEL_OUT}/tools/deb/istio-proxy"
 
-bazel build ${BAZEL_ARGS} ${BAZEL_TARGET}
+bazel build ${BAZEL_BUILD_ARGS} --config=release ${BAZEL_TARGET}
 
 if [[ -n "${GCS_PATH}" ]]; then
   gsutil -m cp -r "${BAZEL_BINARY}.deb" ${GCS_PATH}/