diff options
| author |  Stanley Cheung <stanleycheung@google.com> | 2015-07-22 17:07:55 -0700 |
|---|---|---|
| committer | Stanley Cheung <stanleycheung@google.com> | 2015-07-23 08:43:40 -0700 |
| commit | f4f6bc2c77c488de5b2515002e07a427c2fdd873 (patch) | |
| tree | 17c2fd80adc122cbe064c5328eb6236d2f241a1b /tools/jenkins | |
| parent | d435caa13eb3710a4d3d17825b0efe3a06336ab7 (diff) | |
Minor jenkins script cleanjup
Diffstat (limited to 'tools/jenkins')
| -rwxr-xr-x | tools/jenkins/run_distribution.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/jenkins/run_distribution.sh b/tools/jenkins/run_distribution.sh index 7c306de590..49b7d306d1 100755 --- a/tools/jenkins/run_distribution.sh +++ b/tools/jenkins/run_distribution.sh @@ -32,6 +32,8 @@ # linuxbrew installation of a selected language set -ex +# Our homebrew installation script command, per language +# Can be used in both linux and macos if [ "$language" == "core" ]; then command="curl -fsSL https://goo.gl/getgrpc | bash -" elif [[ "python nodejs ruby php" =~ "$language" ]]; then @@ -66,6 +68,7 @@ if [ "$platform" == "linux" ]; then elif [ "$platform" == "macos" ]; then if [ "$dist_channel" == "homebrew" ]; then + echo "Formulas installed by system-wide homebrew (before)" brew list -l @@ -99,8 +102,6 @@ elif [ "$platform" == "macos" ]; then *php*) export CFLAGS="-Wno-parentheses-equality" ;; - *) - ;; esac # Run our homebrew installation script @@ -108,7 +109,6 @@ elif [ "$platform" == "macos" ]; then # Uninstall / clean up per-language modules/extensions after the test case $language in - *core*) ;; *python*) deactivate rm -rf jenkins_python_venv @@ -124,10 +124,6 @@ elif [ "$platform" == "macos" ]; then *php*) rm grpc.so ;; - *) - echo "Unsupported language $language" - exit 1 - ;; esac # Clean up |