From c19ad3c5ba5d24a0850335e209a06ef706e9e0d0 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Mon, 28 Sep 2020 21:53:37 +0200 Subject: [PATCH] Updated travis build scripts (from rspec-dev) --- .rubocop_rspec_base.yml | 2 +- .travis.yml | 5 +++-- 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, 11 insertions(+), 10 deletions(-) diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index e46e076a6c..4743e12d34 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-28T21:53:37+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..a7a79dc7a7 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-28T21:53:37+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. @@ -41,10 +41,11 @@ matrix: env: JRUBY_OPTS='--dev --1.8' - rvm: 2.7.1 env: DIFF_LCS_VERSION="~> 1.3.0" + - rvm: 2.7.1 + env: DIFF_LCS_VERSION="1.4.3" allow_failures: - rvm: jruby-head - rvm: ruby-head - - rvm: ruby-3.0.0-preview1 - rvm: rbx-3 fast_finish: true branches: diff --git a/appveyor.yml b/appveyor.yml index 65c52a4979..d01ae06d71 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-28T21:53:37+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..d892143b0c 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-28T21:53:37+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..f65baeede4 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-28T21:53:37+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..3c4b4a13e9 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-28T21:53:37+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..87fb8a6ad1 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-28T21:53:37+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..6aa13ff24e 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-28T21:53:37+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..5d4428ba51 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-28T21:53:37+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