Skip to content

Commit 5a17c75

Browse files
authored
Merge pull request rspec#2651 from rspec/update-travis-build-scripts-2019-07-24-for-master
Updates from rspec-dev (2019-07-24)
2 parents aacbae7 + d51070f commit 5a17c75

11 files changed

+13
-12
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-07-08T14:21:38+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-07-24T15:33:48+02: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-07-08T14:21:38+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-07-24T15:33:48+02: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.

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ end
3434

3535
if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
3636
gem 'ffi', '< 1.10'
37-
elsif RUBY_VERSION < '1.9'
37+
elsif RUBY_VERSION < '2.0'
3838
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
3939
else
40-
gem 'ffi', '~> 1.9.25'
40+
gem 'ffi', '~> 1.11.0'
4141
end
4242

4343
if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2019-07-08T14:21:38+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-07-24T15:33:48+02: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}"
@@ -39,3 +39,4 @@ environment:
3939
- ruby_version: 23-x64
4040
- ruby_version: 24-x64
4141
- ruby_version: 25-x64
42+
- ruby_version: 26-x64

lib/rspec/core/bisect/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def capture_run_results(files_or_directories_to_run=[], expected_failures=[])
3333

3434
def start
3535
# Only allow remote DRb requests from this machine.
36-
DRb.install_acl ACL.new(%w[ deny all allow localhost allow 127.0.0.1 ])
36+
DRb.install_acl ACL.new(%w[ deny all allow localhost allow 127.0.0.1 allow ::1 ])
3737

3838
# We pass `nil` as the first arg to allow it to pick a DRb port.
3939
@drb = DRb.start_service(nil, self)

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-07-08T14:21:38+01:00 from the rspec-dev repo.
2+
# This file was generated on 2019-07-24T15:33:48+02: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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2019-07-08T14:21:38+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-07-24T15:33:48+02: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

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-07-08T14:21:38+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-07-24T15:33:48+02: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-07-08T14:21:38+01:00 from the rspec-dev repo.
2+
# This file was generated on 2019-07-24T15:33:48+02: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-07-08T14:21:38+01:00 from the rspec-dev repo.
1+
# This file was generated on 2019-07-24T15:33:48+02: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: 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-07-08T14:21:38+01:00 from the rspec-dev repo.
2+
# This file was generated on 2019-07-24T15:33:48+02: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

0 commit comments

Comments
 (0)