Merge pull request #3098 from rspec/update-ci-build-scripts-2024-07-0…

…9-for-main Updates from rspec-dev (2024-07-09)
rspec · Jul 13, 2024 · 73a5bc8 · 73a5bc8
2 parents 4be46f6 + 68c3bde
commit 73a5bc8
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 18 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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: 2

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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.
 
 name: RSpec CI
@@ -20,7 +20,6 @@ env:
   RSPEC_CI: true
   # This tells rspec-rails what branch to run in ci
   RSPEC_VERSION: '= 3.14.0.pre'
-  ENFORCE_COVERAGE_AFTER: "3.2"
 jobs:
   rubocop:
     name: Rubocop
@@ -131,8 +130,8 @@ jobs:
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
       LEGACY_CI: true
-      NO_COVERAGE: true
       JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
+      NO_COVERAGE: true
     steps:
       - uses: actions/checkout@v3
       - run: ${{ matrix.container.pre }}

diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/lib/rspec/core/configuration_options.rb b/lib/rspec/core/configuration_options.rb
@@ -177,15 +177,15 @@ def args_from_options_file(path)
         FlatMap.flat_map(config_lines, &:shellsplit)
       end
 
+      # :nocov:
       def options_file_as_erb_string(path)
         if RUBY_VERSION >= '2.6'
           ERB.new(File.read(path), :trim_mode => '-').result(binding)
         else
-          # :nocov:
           ERB.new(File.read(path), nil, '-').result(binding)
-          # :nocov:
         end
       end
+      # :nocov:
 
       def custom_options_file
         command_line_options[:custom_options_file]

diff --git a/lib/rspec/core/formatters/exception_presenter.rb b/lib/rspec/core/formatters/exception_presenter.rb
@@ -180,6 +180,7 @@ def failure_slash_error_lines
         end
 
         # rubocop:disable Lint/RescueException
+        # :nocov:
         if SyntaxError.instance_methods.include?(:detailed_message)
           def exception_message_string(exception)
             case exception
@@ -191,14 +192,13 @@ def exception_message_string(exception)
             "A #{exception.class} for which `exception.message.to_s` raises #{other.class}."
           end
         else
-          # :nocov:
           def exception_message_string(exception)
             exception.message.to_s
           rescue Exception => other
             "A #{exception.class} for which `exception.message.to_s` raises #{other.class}."
           end
-          # :nocov:
         end
+        # :nocov:
         # rubocop:enable Lint/RescueException
 
         def exception_lines

diff --git a/lib/rspec/core/option_parser.rb b/lib/rspec/core/option_parser.rb
@@ -185,7 +185,9 @@ def parser(options)
 
         parser.on('-w', '--warnings', 'Enable ruby warnings') do
           if Object.const_defined?(:Warning) && Warning.respond_to?(:[]=)
+            # :nocov: on older Ruby without Warning
             Warning[:deprecated] = true
+            # :nocov:
           end
           $VERBOSE = true
         end

diff --git a/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/cucumber.sh b/script/cucumber.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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
@@ -1,4 +1,4 @@
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/run_rubocop b/script/run_rubocop
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-02-23T14:21:31+00:00 from the rspec-dev repo.
+# This file was generated on 2024-07-09T08:51:38+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