From f414944d6a6aeb584bcbffe0469bffbc3db0133c Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Mon, 28 Sep 2020 10:23:58 +0100 Subject: [PATCH] [core] Merge pull request rspec/rspec-core#2766 from rspec/update-travis-build-scripts-2020-09-27-for-main Updates from rspec-dev (2020-09-27) --- This commit was imported from https://github.com/rspec/rspec-core/commit/d54f7c8c916f85e2186128334f28f745cef99f6f. --- rspec-core/.rubocop_rspec_base.yml | 2 +- rspec-core/.travis.yml | 4 +++- rspec-core/appveyor.yml | 2 +- rspec-core/script/clone_all_rspec_repos | 2 +- rspec-core/script/functions.sh | 2 +- rspec-core/script/predicate_functions.sh | 2 +- rspec-core/script/run_build | 2 +- rspec-core/script/travis_functions.sh | 2 +- rspec-core/script/update_rubygems_and_install_bundler | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/rspec-core/.rubocop_rspec_base.yml b/rspec-core/.rubocop_rspec_base.yml index 54890d7c1..e46e076a6 100644 --- a/rspec-core/.rubocop_rspec_base.yml +++ b/rspec-core/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. # This file contains defaults for RSpec projects. Individual projects diff --git a/rspec-core/.travis.yml b/rspec-core/.travis.yml index 896e3ad34..4923a2896 100644 --- a/rspec-core/.travis.yml +++ b/rspec-core/.travis.yml @@ -1,4 +1,4 @@ -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. # In order to install old Rubies, we need to use old Ubuntu distibution. @@ -26,6 +26,7 @@ rvm: - 2.5.8 - 2.6.6 - 2.7.1 + - ruby-3.0.0-preview1 - ruby-head - ree - rbx-3 @@ -43,6 +44,7 @@ matrix: allow_failures: - rvm: jruby-head - rvm: ruby-head + - rvm: ruby-3.0.0-preview1 - rvm: rbx-3 fast_finish: true branches: diff --git a/rspec-core/appveyor.yml b/rspec-core/appveyor.yml index 2a5be1df8..65c52a497 100644 --- a/rspec-core/appveyor.yml +++ b/rspec-core/appveyor.yml @@ -1,4 +1,4 @@ -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. version: "{build}" diff --git a/rspec-core/script/clone_all_rspec_repos b/rspec-core/script/clone_all_rspec_repos index 5fd07eb94..c8ae62272 100755 --- a/rspec-core/script/clone_all_rspec_repos +++ b/rspec-core/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. set -e diff --git a/rspec-core/script/functions.sh b/rspec-core/script/functions.sh index 01b1c42a5..97c4a3626 100644 --- a/rspec-core/script/functions.sh +++ b/rspec-core/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/rspec-core/script/predicate_functions.sh b/rspec-core/script/predicate_functions.sh index 84a58dd94..e8dfc2fb2 100644 --- a/rspec-core/script/predicate_functions.sh +++ b/rspec-core/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. function is_mri { diff --git a/rspec-core/script/run_build b/rspec-core/script/run_build index 1ca27943b..cc8b8439c 100755 --- a/rspec-core/script/run_build +++ b/rspec-core/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. set -e diff --git a/rspec-core/script/travis_functions.sh b/rspec-core/script/travis_functions.sh index f8e35254a..743fcccaa 100644 --- a/rspec-core/script/travis_functions.sh +++ b/rspec-core/script/travis_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. # Taken from: diff --git a/rspec-core/script/update_rubygems_and_install_bundler b/rspec-core/script/update_rubygems_and_install_bundler index 796e4f6c1..8f3fa6c3a 100755 --- a/rspec-core/script/update_rubygems_and_install_bundler +++ b/rspec-core/script/update_rubygems_and_install_bundler @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2020-06-21T22:22:12+01:00 from the rspec-dev repo. +# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. set -e