diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-07-12 16:33:21 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-07-12 17:26:29 +0200 |
| commit | 4af2c5d0e465b14dd057020cf1f9cc04a8ae82a9 (patch) | |
| tree | 954642ef9022e6fc9b464d3054ac1dd454863da9 /tools | |
| parent | ca0b8084bd06001be35a66a47357e81df8ef583a (diff) | |
fix linux artifact build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_rc | 2 | ||||
| -rwxr-xr-x | tools/internal_ci/linux/grpc_build_artifacts.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 7d2c5221d1..57463e6f6d 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -31,7 +31,7 @@ brew install gflags set +ex # rvm script is very verbose and exits with errorcode source $HOME/.rvm/scripts/rvm -set -e # rvm commands are very verbose +set -e # rvm commands are very verbose rvm install ruby-2.4 rvm osx-ssl-certs status all rvm osx-ssl-certs update all diff --git a/tools/internal_ci/linux/grpc_build_artifacts.sh b/tools/internal_ci/linux/grpc_build_artifacts.sh index 1f438a6730..bc29014ab5 100755 --- a/tools/internal_ci/linux/grpc_build_artifacts.sh +++ b/tools/internal_ci/linux/grpc_build_artifacts.sh @@ -22,6 +22,7 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc # TODO(jtattermusch): install ruby on the internal_ci worker gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -curl -sSL https://get.rvm.io | bash -s stable --ruby +# TODO(jtattermusch): grep works around https://github.com/rvm/rvm/issues/4068 +curl -sSL https://get.rvm.io | grep -v __rvm_print_headline | bash -s stable --ruby tools/run_tests/task_runner.py -f artifact linux |