diff --git a/Makefile.core.mk b/Makefile.core.mk index bb3e27784..9f488af7d 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -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 diff --git a/prow/proxy-common.inc b/prow/proxy-common.inc index a247126d7..99b5d8d46 100755 --- a/prow/proxy-common.inc +++ b/prow/proxy-common.inc @@ -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