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

Automator: update common-files@master in istio/istio.io@master (#6979)

This commit is contained in:
Istio Automation 2020-03-27 14:56:44 -07:00 committed by GitHub
parent ccf7e68471
commit b910dd420e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -40,13 +40,13 @@ $(shell $(shell pwd)/common/scripts/setup_env.sh)
RUN = ./common/scripts/run.sh
MAKE = $(RUN) make --no-print-directory -e -f Makefile.core.mk
MAKE_DOCKER = $(RUN) $(MAKE) --no-print-directory -e -f Makefile.core.mk
%:
@$(MAKE) $@
@$(MAKE_DOCKER) $@
default:
@$(MAKE)
@$(MAKE_DOCKER)
shell:
@$(RUN) /bin/bash

2
common/.commonfiles.sha
View File

@ -1 +1 @@
12367561d40cda9038675d79901118403f25022e
ac40d17fb808f434b815094db23b67e2a74636b4

4
common/scripts/setup_env.sh
View File

@ -96,6 +96,9 @@ if [[ -d "${HOME}/.kube" ]]; then
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.kube,destination=/home/.kube "
fi
# Avoid recursive calls to make from attempting to start an additional container
export BUILD_WITH_CONTAINER=0
# For non container build, we need to write env to file
if [[ "${1}" == "envfile" ]]; then
echo "TARGET_OUT_LINUX=${TARGET_OUT_LINUX}"
@ -105,4 +108,5 @@ if [[ "${1}" == "envfile" ]]; then
echo "TARGET_OS=${TARGET_OS}"
echo "LOCAL_ARCH=${LOCAL_ARCH}"
echo "TARGET_ARCH=${TARGET_ARCH}"
echo "BUILD_WITH_CONTAINER=0"
fi