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

Commit 07aa08b

Browse files
authored
Merge pull request #2678 from rspec/update-travis-build-scripts-2019-12-18-for-master
Updates from rspec-dev (2019-12-18)
2 parents 91bc14f + 15fa6b6 commit 07aa08b

9 files changed

+12
-13
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 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-18T14:01:38+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-18T14:01:38+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
# In order to install old Rubies, we need to use old Ubuntu distibution.

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 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-18T14:01:38+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

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 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
2+
# This file was generated on 2019-12-18T14:01:38+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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# This file was generated on 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-18T14:01:38+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 )"
55
source $SCRIPT_DIR/travis_functions.sh
66
source $SCRIPT_DIR/predicate_functions.sh
77

88
# If JRUBY_OPTS isn't set, use these.
9-
# see http://docs.travis-ci.com/user/ci-environment/
9+
# see https://docs.travis-ci.com/user/ci-environment/
1010
export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
1111
SPECS_HAVE_RUN_FILE=specs.out
1212
MAINTENANCE_BRANCH=`cat maintenance-branch`
@@ -187,7 +187,6 @@ function run_all_spec_suites {
187187
fold "rspec-core specs" run_spec_suite_for "rspec-core"
188188
fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
189189
fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
190-
191190
if rspec_rails_compatible; then
192191
fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
193192
fi

script/predicate_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 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-18T14:01:38+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 {

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 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
2+
# This file was generated on 2019-12-18T14:01:38+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-18T14:01:38+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:

script/update_rubygems_and_install_bundler

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
2-
# This file was generated on 2019-10-21T09:35:11+01:00 from the rspec-dev repo.
2+
# This file was generated on 2019-12-18T14:01:38+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
66
source script/functions.sh
77

88
if is_ruby_23_plus; then
9-
gem update --system
10-
gem install bundler
9+
yes | gem update --system
10+
yes | gem install bundler
1111
else
1212
echo "Warning installing older versions of Rubygems / Bundler"
1313
gem update --system '2.7.8'

0 commit comments

Comments
 (0)