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

Commit cc68276

Browse files
authored
Updated travis build scripts (from rspec-dev) (#2589)
1 parent fb5aa28 commit cc68276

9 files changed

+32
-11
lines changed

.rubocop_rspec_base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
1+
# This file was generated on 2019-01-03T20:34:23+00: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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
1+
# This file was generated on 2019-01-03T20:34:23+00: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
@@ -8,9 +8,7 @@ cache:
88
directories:
99
- ../bundle
1010
before_install:
11-
# We need to ensure the latest version of Rubygems, unless we're on an old Ruby.
12-
- gem update --system $(ruby -e "puts '2.7.8' if ENV['RUBY_VERSION'] >= '2.3.0'")
13-
- gem install bundler
11+
- "script/update_rubygems_and_install_bundler"
1412
- unset _JAVA_OPTIONS
1513
- "script/clone_all_rspec_repos"
1614
bundler_args: "--binstubs --standalone --without documentation --path ../bundle"

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
1+
# This file was generated on 2019-01-03T20:34:23+00: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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
2+
# This file was generated on 2019-01-03T20:34:23+00: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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
1+
# This file was generated on 2019-01-03T20:34:23+00: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 )"

script/predicate_functions.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
1+
# This file was generated on 2019-01-03T20:34:23+00: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 {
@@ -57,6 +57,14 @@ function is_mri_2plus {
5757
fi
5858
}
5959

60+
function is_ruby_23_plus {
61+
if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
62+
return 0
63+
else
64+
return 1
65+
fi
66+
}
67+
6068
function rspec_support_compatible {
6169
if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ] && [ "$MAINTENANCE_BRANCH" != "2-14-maintenance" ]; then
6270
return 0

script/run_build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
2+
# This file was generated on 2019-01-03T20:34:23+00: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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
1+
# This file was generated on 2019-01-03T20:34:23+00: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:
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
# This file was generated on 2019-01-03T20:34:23+00:00 from the rspec-dev repo.
3+
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
4+
5+
set -e
6+
source script/functions.sh
7+
8+
if is_ruby_23_plus; then
9+
gem update --system
10+
gem install bundler
11+
else
12+
echo "Warning installing older versions of Rubygems / Bundler"
13+
gem update --system '2.7.8'
14+
gem install bundler -v '1.17.3'
15+
fi

0 commit comments

Comments
 (0)