Merge pull request #608 from rspec/update-ci-build-scripts-2024-07-15…

…-for-main Updates from rspec-dev (2024-07-15)
rspec · Jul 15, 2024 · 9a85e6e · 9a85e6e
2 parents d144907 + 2146fb7
commit 9a85e6e
Show file tree

Hide file tree

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

diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 )"
@@ -68,6 +68,13 @@ function run_cukes {
       RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
          PATH="${PWD}/bin:$PATH" \
          bin/cucumber --strict
+    elif is_ruby_head; then
+      # This is a monkey patch to fix an issue with cucumber using outdated hash syntax, remove when cucumber is updated or ruby 3.4 released
+      sed -i '$i\class Hash; alias :__initialize :initialize; def initialize(*args, **_kw, &block) = __initialize(*args, &block); end' bin/cucumber
+
+      RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
+         PATH="${PWD}/bin:$PATH" \
+         bin/cucumber --strict
     else
       # Prepare RUBYOPT for scenarios that are shelling out to ruby,
       # and PATH for those that are using `rspec` or `rake`.

diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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 2024-07-09T08:51:40+02:00 from the rspec-dev repo.
+# This file was generated on 2024-07-15T21:58:53+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