Merge branch '4-0-dev' into update-ci-build-scripts-2020-12-21-for-4-0-dev

JonRowe · web-flow · commit 1433a74e2967 · 2020-12-21T21:58:56.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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
@@ -13,6 +13,8 @@ on:
       - '*'
 env:
   RSPEC_CI: true
+  # This tells rspec-rails what branch to run in ci
+  RSPEC_VERSION: '= 4.0.0.pre'
 jobs:
   test:
     name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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-21T19:48:18+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-21T20:11:14+00: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-21T19:48:18+00:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2020-12-21T20:11:14+00: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`