Skip to content

Commit 98c2053

Browse files
Fix mac ruby tests
1 parent af19b32 commit 98c2053

File tree

8 files changed

+14
-42
lines changed

8 files changed

+14
-42
lines changed

kokoro/macos/ruby25/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# Change to repo root
66
cd $(dirname $0)/../../..
77

8-
./kokoro/macos/test_ruby.sh ruby-2.5.1
8+
bash -l kokoro/macos/test_ruby.sh ruby-2.5.1

kokoro/macos/ruby26/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# Change to repo root
66
cd $(dirname $0)/../../..
77

8-
./kokoro/macos/test_ruby.sh ruby-2.6.0
8+
bash -l kokoro/macos/test_ruby.sh ruby-2.6.0

kokoro/macos/ruby27/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# Change to repo root
66
cd $(dirname $0)/../../..
77

8-
./kokoro/macos/test_ruby.sh ruby-2.7.0
8+
bash -l kokoro/macos/test_ruby.sh ruby-2.7.0

kokoro/macos/ruby30/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# Change to repo root
66
cd $(dirname $0)/../../..
77

8-
./kokoro/macos/test_ruby.sh ruby-3.0.2
8+
bash -l kokoro/macos/test_ruby.sh ruby-3.0.2

kokoro/macos/ruby31/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ cd $(dirname $0)/../../..
88
# Fix locale issues in Monterey.
99
export LC_ALL=en_US.UTF-8
1010

11-
./kokoro/macos/test_ruby.sh ruby-3.1.0
11+
bash -l kokoro/macos/test_ruby.sh ruby-3.1.0

kokoro/macos/test_ruby.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
#!/bin/bash
22

3-
set -ex
3+
set -eux
44

55
VERSION=$1
66

77
# Prepare worker environment to run tests
88
KOKORO_INSTALL_RVM=yes
99
source kokoro/macos/prepare_build_macos_rc
1010

11-
# Setup ruby
11+
# Install dependencies
12+
brew install wget
13+
14+
# Configure system ruby.
15+
# We need to disable unbound variable errors, due to a known issue described in
16+
# https://github.com/rvm/rvm/issues/4618.
17+
set +u
1218
rvm install $VERSION
1319
rvm use $VERSION
14-
rvm get head
15-
which ruby
1620
rvm current | grep -qe "${RUBY_VERSION}.*" || exit 1;
21+
set -u
1722

1823
# Run tests
1924
bazel test //ruby/... --test_env=KOKORO_RUBY_VERSION=$VERSION

ruby/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ pkg_files(
7373
"Gemfile",
7474
"Rakefile",
7575
"README.md",
76-
"travis-test.sh",
7776
],
7877
strip_prefix = strip_prefix.from_root(""),
7978
visibility = ["//pkg:__pkg__"],

ruby/travis-test.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)