Merge pull request #2880 from rspec/fix-build

Remove outdated`bundle install --binstubs` command

Author: JonRowe

.github/workflows/ci.yml

@@ -25,8 +25,7 @@ jobs:
         with:
           ruby-version: '3.3'
       - run: script/update_rubygems_and_install_bundler
-      - run: bundle install --standalone
-      - run: bundle binstubs --all
+      - run: script/bundle
       - run: script/run_rubocop
 
   test:
@@ -43,9 +42,6 @@ jobs:
          - ruby: 3.3
            env:
              RAILS_VERSION: 'main'
-         - ruby: 3.2
-           env:
-             RAILS_VERSION: 'main'
 
          # Rails 8.1 builds >= 3.2
          - ruby: 3.4
@@ -88,6 +84,6 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - run: script/update_rubygems_and_install_bundler
       - run: script/clone_all_rspec_repos
-      - run: bundle install --binstubs
+      - run: script/bundle
       - run: script/run_build
         continue-on-error: ${{ matrix.allow_failure || false }}

example_app_generator/ci_retry_bundle_install.sh

@@ -4,4 +4,4 @@ set -e
 source FUNCTIONS_SCRIPT_FILE
 
 echo "Starting bundle install using shared bundle path"
-ci_retry eval "RUBYOPT=$RUBYOPT:' --enable rubygems' bundle install --gemfile ./Gemfile --path REPLACE_BUNDLE_PATH --retry=3 --jobs=3"
+ci_retry eval "bundle config set path REPLACE_BUNDLE_PATH; bundle install --gemfile ./Gemfile --retry=3 --jobs=3"

script/bundle

@@ -0,0 +1,16 @@
+set -e
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+SCRIPT_DIR="${ROOT_DIR}/script"
+source $SCRIPT_DIR/functions.sh
+
+echo "Set bundle path to .bundle/gems"
+bundle config set --local path '.bundle/gems'
+
+# We don't run standalone because rails will break
+
+echo "bundle install"
+bundle install
+
+echo "bundle binstubs --all"
+bundle binstubs --all

script/functions.sh

@@ -2,9 +2,21 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SPECS_HAVE_RUN_FILE=specs.out
 MAINTENANCE_BRANCH=`cat maintenance-branch`
 
-# Don't allow rubygems to pollute what's loaded. Also, things boot faster
-# without the extra load time of rubygems. Only works on MRI Ruby 1.9+
-export RUBYOPT="--disable=gem"
+function is_ruby_3_2_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 3.2)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function is_ruby_3_3_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 3.3)"; then
+    return 0
+  else
+    return 1
+  fi
+}
 
 ci_retry() {
   local result=0
@@ -112,13 +124,13 @@ function check_binstubs {
     echo "Install missing binstubs using one of the following:"
     echo
     echo "  # Create the missing binstubs"
-    echo "  $ bundle binstubs$gems"
+    echo "  $ bundle binstubs $gems"
     echo
     echo "  # To binstub all gems"
-    echo "  $ bundle install --binstubs"
+    echo "  $ bundle binstubs --all"
     echo
     echo "  # To binstub all gems and avoid loading bundler"
-    echo "  $ bundle install --binstubs --standalone"
+    echo "  $ bundle binstubs --all"
   fi
 
   return $success

script/run_build

@@ -10,7 +10,9 @@ fold "specs" run_specs_and_record_done
 
 fold "acceptance" bin/rake acceptance --trace
 
-fold "snippets" script/run_snippets.sh
+if is_ruby_3_2_plus; then
+  fold "snippets" script/run_snippets.sh
+fi
 
 if documentation_enforced; then
   fold "doc check" check_documentation_coverage

script/update_rubygems_and_install_bundler

@@ -2,31 +2,16 @@
 # This file is manually managed unlike the rest of core rspec gems because it is independent.
 
 set -e
+source script/functions.sh
 
-function is_ruby_3_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 3.0)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function is_ruby_3_1_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-
-if is_ruby_3_1_plus; then
+if is_ruby_3_2_plus; then
   gem update --no-document --system
   gem install --no-document bundler
-elif is_ruby_3_plus; then
-  gem update --no-document --system '3.5.23'
-  gem install --no-document bundler
 else
   gem update --no-document --system '3.4.22'
-  gem install --no-document bundler
+  gem install --no-document bundler -v '2.6.9'
+
+  # Bring this default gem up to last supported manually
+  gem uninstall error_highlight -v 0.3.0
+  gem install error_highlight -v 0.7.0
 fi