From fb1df04ef4ad65c5716f5f24440b2718522b2f9a Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Mon, 28 Sep 2020 15:39:27 +0200 Subject: [PATCH] Updated travis build scripts (from rspec-dev) --- .rubocop_rspec_base.yml | 2 +- .travis.yml | 7 ++----- appveyor.yml | 2 +- script/clone_all_rspec_repos | 2 +- script/functions.sh | 2 +- script/predicate_functions.sh | 2 +- script/run_build | 2 +- script/travis_functions.sh | 2 +- script/update_rubygems_and_install_bundler | 2 +- 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index e46e076a6c..306500425b 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/.travis.yml b/.travis.yml index 4923a2896a..be0f5c0986 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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. @@ -39,15 +39,12 @@ matrix: include: - rvm: jruby-1.7 env: JRUBY_OPTS='--dev --1.8' - - rvm: 2.7.1 - env: DIFF_LCS_VERSION="~> 1.3.0" allow_failures: - rvm: jruby-head - rvm: ruby-head - - rvm: ruby-3.0.0-preview1 - rvm: rbx-3 fast_finish: true branches: only: - - main + - master - /^\d+-\d+-maintenance$/ diff --git a/appveyor.yml b/appveyor.yml index 65c52a4979..1e8198c53f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/script/clone_all_rspec_repos b/script/clone_all_rspec_repos index 0e64187686..67899f5a66 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/script/functions.sh b/script/functions.sh index 9984dff46d..7158212ed6 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/script/predicate_functions.sh b/script/predicate_functions.sh index 963b493b1e..73685f101d 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/script/run_build b/script/run_build index cc8b8439cd..2296d723a5 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/script/travis_functions.sh b/script/travis_functions.sh index 743fcccaa3..f23d0efce2 100644 --- a/script/travis_functions.sh +++ b/script/travis_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler index 8f3fa6c3a3..eeb411e644 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2020-09-27T11:30:20+02:00 from the rspec-dev repo. +# This file was generated on 2020-09-28T15:39:27+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