Merge pull request #574 from rspec/update-ci-build-scripts-2023-04-11-for-3-12-maintenance

JonRowe · web-flow · commit d6e4579e2f1a · 2023-04-11T17:23:47.000+01:00
Updates from rspec-dev (2023-04-11)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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.
 
 version: 2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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
@@ -50,7 +50,6 @@ jobs:
           - 2.4
           - 2.3
           - 2.2
-          - 2.1.9
         env:
           -
             DIFF_LCS_VERSION: "> 1.4.3"
@@ -94,6 +93,9 @@ jobs:
       fail-fast: false
       matrix:
         container:
+          - version: "2.1.9"
+            tag: ghcr.io/rspec/docker-ci:2.1.9
+            post: git config --global --add safe.directory `pwd`
           - version: "2.0"
             tag: ghcr.io/rspec/docker-ci:2.0.0
           - version: "1.9.3"
@@ -124,6 +126,7 @@ jobs:
       - uses: actions/checkout@v3
       - run: ${{ matrix.container.pre }}
       - run: script/legacy_setup.sh
+      - run: ${{ matrix.container.post }}
       - run: bundle exec bin/rspec
       - run: bundle exec script/cucumber.sh
 
@@ -139,7 +142,6 @@ jobs:
           - 2.4
           - 2.3
           - 2.2
-          - 2.1.9
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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/cucumber.sh b/script/cucumber.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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/run_rubocop b/script/run_rubocop
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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 2023-03-16T21:03:44+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-11T15:33:34+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/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb
@@ -28,13 +28,13 @@
     order.join_all
   end
 
-  # On Ruby 3.1.3, 3.2.0 and RUBY_HEAD the raise in this spec can
+  # On Ruby 3.1.3+, 3.2.0 and RUBY_HEAD the raise in this spec can
   # bypass the `raise_error` capture and break this spec but
   # it is not sufficient to pend it as the raise can escape to the other
   # threads somehow therefore poisoning them so its skipped entirely.
   # This is a temporary work around to allow green cross project builds but
   # needs a fix.
-  if RUBY_VERSION >= '3.0' && RUBY_VERSION != '3.1.3' && RUBY_VERSION < '3.2.0' && !ENV['RUBY_HEAD']
+  if RUBY_VERSION >= '3.0' && RUBY_VERSION < '3.1.3' && !ENV['RUBY_HEAD']
     it 'waits when trying to lock from another Fiber' do
       mutex.synchronize do
         ready = false

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2023-03-16T21:03:44+00:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2023-04-11T15:33:34+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`	`version: 2`