istio
/
proxy
mirror of https://github.com/istio/proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix post-submit #2 (#2797) 

* build before pushing

Signed-off-by: Kuat Yessenov <kuat@google.com>

* typo

Signed-off-by: Kuat Yessenov <kuat@google.com>
This commit is contained in:
Kuat 2020-04-09 11:37:57 -07:00 committed by GitHub
parent 2a56e063e2
commit ab00158a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.core.mk
View File

@ -126,7 +126,7 @@ artifacts:
test_release:
export PATH=$(PATH) CC=$(CC) CXX=$(CXX) BAZEL_BUILD_ARGS="$(BAZEL_BUILD_ARGS)" && ./scripts/release-binary.sh
push_release:
push_release: build
export PATH=$(PATH) CC=$(CC) CXX=$(CXX) BAZEL_BUILD_ARGS="$(BAZEL_BUILD_ARGS)" && ./scripts/release-binary.sh -d "$(RELEASE_GCS_PATH)" -p && ./scripts/generate-wasm.sh -b -p -d "$(RELEASE_GCS_PATH)"
.PHONY: build clean test check artifacts

36
prow/proxy-common.inc
View File

@ -46,21 +46,21 @@ export BAZEL_OUT="$(bazel info ${BAZEL_BUILD_ARGS} output_path)/k8-fastbuild/bin
export BAZEL_BUILD_RBE_JOBS=0
# Use GCP service account when available.
# if [[ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ]]; then
# echo "Detected GOOGLE_APPLICATION_CREDENTIALS, activating..." >&2
# gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"
#
# # Use RBE when logged in.
# BAZEL_BUILD_RBE_INSTANCE="${BAZEL_BUILD_RBE_INSTANCE:-projects/istio-testing/instances/default_instance}"
# BAZEL_BUILD_RBE_CACHE="${BAZEL_BUILD_RBE_CACHE:-grpcs://remotebuildexecution.googleapis.com}"
# BAZEL_BUILD_RBE_JOBS="${BAZEL_BUILD_RBE_JOBS:-200}"
# if [[ -n "${BAZEL_BUILD_RBE_INSTANCE}" ]]; then
# if [[ "${BAZEL_BUILD_RBE_JOBS}" -gt 0 ]]; then
# echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (execute)"
# export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --config=remote-clang-libc++ --config=remote-ci --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --jobs=${BAZEL_BUILD_RBE_JOBS}"
# elif [[ -n "${BAZEL_BUILD_RBE_CACHE}" ]]; then
# echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (cache)"
# export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --remote_cache=${BAZEL_BUILD_RBE_CACHE}"
# fi
# fi
# fi
if [[ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ]]; then
echo "Detected GOOGLE_APPLICATION_CREDENTIALS, activating..." >&2
gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"
# Use RBE when logged in.
BAZEL_BUILD_RBE_INSTANCE="${BAZEL_BUILD_RBE_INSTANCE:-projects/istio-testing/instances/default_instance}"
BAZEL_BUILD_RBE_CACHE="${BAZEL_BUILD_RBE_CACHE:-grpcs://remotebuildexecution.googleapis.com}"
BAZEL_BUILD_RBE_JOBS="${BAZEL_BUILD_RBE_JOBS:-200}"
if [[ -n "${BAZEL_BUILD_RBE_INSTANCE}" ]]; then
if [[ "${BAZEL_BUILD_RBE_JOBS}" -gt 0 ]]; then
echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (execute)"
export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --config=remote-clang-libc++ --config=remote-ci --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --jobs=${BAZEL_BUILD_RBE_JOBS}"
elif [[ -n "${BAZEL_BUILD_RBE_CACHE}" ]]; then
echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (cache)"
export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --remote_cache=${BAZEL_BUILD_RBE_CACHE}"
fi
fi
fi