Merge pull request #2804 from rspec/update-ci-build-scripts-2020-12-21-for-main

JonRowe · JonRowe · commit e519a9c0e404 · 2020-12-27T13:34:42.000Z
Updates from rspec-dev (2020-12-21)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 name: RSpec CI
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.0.0-preview2
+          - 3.0.0-rc1
           - 2.7
           - 2.6
           - 2.5
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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.
diff --git a/features/command_line/warnings_option.feature b/features/command_line/warnings_option.feature
@@ -8,7 +8,7 @@ Feature: `--warnings` option (run with warnings enabled)
       """ruby
       RSpec.describe do
         it 'generates warning' do
-          @undefined
+          $undefined
         end
       end
       """
@@ -21,7 +21,7 @@ Feature: `--warnings` option (run with warnings enabled)
       """ruby
       RSpec.describe do
         it 'generates warning' do
-          @undefined
+          $undefined
         end
       end
       """
diff --git a/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:42:54+01: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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2020-12-21T20:42:54+01:00 from the rspec-dev repo.`
`2`	`2`	`# DO NOT modify it by hand as your changes will get lost the next time it is generated.`
`3`	`3`
`4`	`4`	`# This file contains defaults for RSpec projects. Individual projects`