From d6f959b17b5f495ca439dd0a82c958cabd5b4b65 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 29 Apr 2020 13:53:20 -0700 Subject: [PATCH] No need to specify the env var explicitly --- CONTRIBUTING.md | 2 +- kokoro/master.cfg | 4 ---- scripts/kokoro.sh | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 282cd0d..72f14fd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ In order to protect both you and ourselves, you will need to sign the The basic build script should run to completion. ```sh -$ MASTER=1 ./scripts/kokoro.sh +$ ./scripts/kokoro.sh ``` More details to come. diff --git a/kokoro/master.cfg b/kokoro/master.cfg index 86672b0..6f1ce0a 100644 --- a/kokoro/master.cfg +++ b/kokoro/master.cfg @@ -1,5 +1 @@ build_file: "grpc-web/scripts/kokoro.sh" -env_vars { - key: "MASTER" - value: "1" -} diff --git a/scripts/kokoro.sh b/scripts/kokoro.sh index 26a7ef1..e24c05e 100755 --- a/scripts/kokoro.sh +++ b/scripts/kokoro.sh @@ -17,6 +17,8 @@ set -ex SCRIPT_DIR=$(dirname "$0") cd "${SCRIPT_DIR}" +export MASTER=1 + ./run_basic_tests.sh ./run_interop_tests.sh