Updated ci build scripts (from rspec-dev)main

JonRowe · JonRowe · commit e0b5e0eca92b · 2022-01-10T22:10:26.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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
@@ -16,12 +16,27 @@ env:
   # This tells rspec-rails what branch to run in ci
   RSPEC_VERSION: '= 3.11.0.pre'
 jobs:
+  rubocop:
+    name: Rubocop
+    runs-on: 'ubuntu-20.04'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - run: script/update_rubygems_and_install_bundler
+      - run: script/clone_all_rspec_repos
+      - run: bundle install --standalone
+      - run: bundle binstubs --all
+      - run: script/run_rubocop
+
   test:
     name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
     runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
     strategy:
       matrix:
         ruby:
+          - '3.1'
           - '3.0'
           - 2.7
           - 2.6
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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/cucumber.sh b/script/cucumber.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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
@@ -24,10 +24,6 @@ if documentation_enforced; then
   fold "doc check" check_documentation_coverage
 fi
 
-if style_and_lint_enforced; then
-  fold "rubocop" check_style_and_lint
-fi
-
 if supports_cross_build_checks; then
   fold "one-by-one specs" run_specs_one_by_one
   export NO_COVERAGE=true
diff --git a/script/run_rubocop b/script/run_rubocop
@@ -0,0 +1,14 @@
+#!/bin/bash
+# This file was generated on 2022-01-10T22:10:26+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
+source script/functions.sh
+
+# Allow repos to override the default functions and add their own
+if [ -f script/custom_build_functions.sh ]; then
+  source script/custom_build_functions.sh
+fi
+
+
+fold "rubocop" check_style_and_lint
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 2021-07-15T10:45:52+01:00 from the rspec-dev repo.
+# This file was generated on 2022-01-10T22:10:26+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 2021-07-15T10:45:52+01:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2022-01-10T22:10:26+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`