Skip to content

Commit 1dbabb2

Browse files
committed
really fix sh CI issue
1 parent a38e60d commit 1dbabb2

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

spec/integration/integration_spec.rb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,16 @@
5656
klass = "Annotate::Validations::#{base_dir.gsub('.', '_').classify}".constantize
5757

5858
Dir.chdir(temp_dir) do
59-
output = `
60-
(
61-
export AUTOMATED_TEST="#{BASEDIR}"
62-
63-
# First, make sure we're not in 'sh' mode (I.E. strict-superset-of-Bourne
64-
# mode), as RVM doesn't like this...
65-
shopt -u -o posix
66-
67-
source .rvmrc &&
68-
#{klass.test_commands}
69-
) 2>&1`.chomp
59+
# bash is required by rvm
60+
# the shopt command forces us out of "strict sh" mode
61+
commands = <<-BASH
62+
export AUTOMATED_TEST="#{BASEDIR}";
63+
shopt -u -o posix;
64+
source .rvmrc &&
65+
(bundle check || bundle install) &&
66+
#{klass.test_commands}
67+
BASH
68+
output = `/usr/bin/env bash -c '#{commands}' 2>&1`.chomp
7069
klass.verify_output(output)
7170
klass.verify_files(test_rig)
7271
end

0 commit comments

Comments
 (0)