Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit cff6161

Browse files
committed
Updated travis build scripts (from rspec-dev)
1 parent 11013d5 commit cff6161

File tree

8 files changed

+29
-9
lines changed

8 files changed

+29
-9
lines changed

.rubocop_rspec_base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
1+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
1+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
language: ruby

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
1+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: "{build}"

script/clone_all_rspec_repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
2+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/functions.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
1+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -11,6 +11,14 @@ export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
1111
SPECS_HAVE_RUN_FILE=specs.out
1212
MAINTENANCE_BRANCH=`cat maintenance-branch`
1313

14+
# Don't allow rubygems to pollute what's loaded. Also, things boot faster
15+
# without the extra load time of rubygems. Only works on MRI Ruby 1.9+
16+
if is_mri_192_plus; then
17+
export RUBYOPT="--disable=gem"
18+
else
19+
export RUBYOPT=""
20+
fi
21+
1422
function clone_repo {
1523
if [ ! -d $1 ]; then # don't clone if the dir is already there
1624
travis_retry eval "git clone git://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH"
@@ -49,7 +57,7 @@ function run_cukes {
4957
else
5058
# Prepare RUBYOPT for scenarios that are shelling out to ruby,
5159
# and PATH for those that are using `rspec` or `rake`.
52-
RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
60+
RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
5361
PATH="${PWD}/bin:$PATH" \
5462
bin/cucumber --strict
5563
fi

script/predicate_functions.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
1+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {
@@ -23,6 +23,18 @@ function is_mri_192 {
2323
fi
2424
}
2525

26+
function is_mri_192_plus {
27+
if is_mri; then
28+
if ruby -e "exit(RUBY_VERSION.to_f > 1.9)"; then
29+
return 0
30+
else
31+
return 1
32+
fi
33+
else
34+
return 1
35+
fi
36+
}
37+
2638
function is_mri_2plus {
2739
if is_mri; then
2840
if ruby -e "exit(RUBY_VERSION.to_f > 2.0)"; then

script/run_build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
2+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/travis_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2015-08-01T02:04:28-04:00 from the rspec-dev repo.
1+
# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

0 commit comments

Comments
 (0)