Merge pull request #3070 from rspec/update-ci-build-scripts-2024-02-2…

…3-for-main

Updates from rspec-dev (2024-02-23)

.github/dependabot.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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.
 
 version: 2

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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

Gemfile

@@ -8,7 +8,11 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
   if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
   else
-    gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch
+    if lib == 'rspec'
+      gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch
+    else
+      gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch
+    end
   end
 end
 

script/ci_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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:
@@ -30,41 +30,17 @@ nano_cmd="$(type -p gdate date | head -1)"
 nano_format="+%s%N"
 [ "$(uname -s)" != "Darwin" ] || nano_format="${nano_format/%N/000000000}"
 
-travis_time_start() {
-  travis_timer_id=$(printf %08x $(( RANDOM * RANDOM )))
-  travis_start_time=$($nano_cmd -u "$nano_format")
-  printf "travis_time:start:%s\r\e[0m" $travis_timer_id
-}
-
-travis_time_finish() {
-  local travis_end_time=$($nano_cmd -u "$nano_format")
-  local duration=$(($travis_end_time-$travis_start_time))
-  printf "travis_time:end:%s:start=%s,finish=%s,duration=%s\r\e[0m" \
-    $travis_timer_id $travis_start_time $travis_end_time $duration
-}
-
 fold() {
   local name="$1"
   local status=0
   shift 1
-  if [ -n "$TRAVIS" ]; then
-    printf "travis_fold:start:%s\r\e[0m" "$name"
-    travis_time_start
-  else
-    echo "============= Starting $name ==============="
-  fi
+  echo "============= Starting $name ==============="
 
   "$@"
   status=$?
 
-  [ -z "$TRAVIS" ] || travis_time_finish
-
   if [ "$status" -eq 0 ]; then
-    if [ -n "$TRAVIS" ]; then
-      printf "travis_fold:end:%s\r\e[0m" "$name"
-    else
-      echo "============= Ending $name ==============="
-    fi
+    echo "============= Ending $name ==============="
   else
     STATUS="$status"
   fi

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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
@@ -8,7 +8,7 @@ source script/functions.sh
 if is_mri; then
   pushd ..
 
-  clone_repo "rspec"
+  clone_repo "rspec-metagem" "rspec"
   clone_repo "rspec-core"
   clone_repo "rspec-expectations"
   clone_repo "rspec-mocks"

script/cucumber.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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

script/functions.sh

@@ -1,12 +1,11 @@
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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 )"
 source $SCRIPT_DIR/ci_functions.sh
 source $SCRIPT_DIR/predicate_functions.sh
 
 # If JRUBY_OPTS isn't set, use these.
-# see https://docs.travis-ci.com/user/ci-environment/
 export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
 SPECS_HAVE_RUN_FILE=specs.out
 MAINTENANCE_BRANCH=`cat maintenance-branch`
@@ -20,12 +19,18 @@ fi
 function clone_repo {
   if [ ! -d $1 ]; then # don't clone if the dir is already there
     if [ -z "$2" ]; then
+      DIR_TARGET="$1"
+    else
+      DIR_TARGET="$2"
+    fi
+
+    if [ -z "$3" ]; then
       BRANCH_TO_CLONE="${MAINTENANCE_BRANCH?}";
     else
-      BRANCH_TO_CLONE="$2";
+      BRANCH_TO_CLONE="$3";
     fi;
 
-    ci_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
+    ci_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?} ${DIR_TARGET?}"
   fi;
 }
 

script/legacy_setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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 {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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

script/run_rubocop

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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

script/update_rubygems_and_install_bundler

@@ -1,14 +1,14 @@
 #!/bin/bash
-# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
+# This file was generated on 2024-02-23T14:21:31+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
 
 if is_ruby_31_plus; then
-  echo "Installing rubygems 3.3.6 / bundler 2.3.6"
-  yes | gem update --system '3.3.6'
-  yes | gem install bundler -v '2.3.6'
+  echo "Installing most recent rubygems / bundler"
+  yes | gem update --no-document --system
+  yes | gem install --no-document bundler
 elif is_ruby_23_plus; then
   echo "Installing rubygems 3.2.22 / bundler 2.2.22"
   yes | gem update --system '3.2.22'

spec/integration/spec_file_load_errors_spec.rb

@@ -201,7 +201,6 @@ def foo
 
           expect(formatted_output).to include unindent(<<-EOS)
             While loading ./broken_file a `raise SyntaxError` occurred, RSpec will now quit.
-            Failure/Error: __send__(method, file)
           EOS
 
           # A fix was backported to 3.2.3