Merge pull request #326 from rspec/fix-rails-build

Fix rails build
rspec · Sep 3, 2024 · b77372d · b77372d
2 parents 003c16a + 447e895
commit b77372d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/Rakefile b/Rakefile
@@ -236,9 +236,9 @@ task :update_docs, [:version, :website_path, :branch] do |_t, args|
         `git fetch --tags && git tag -l "v#{args[:version]}*" | grep v#{args[:version]} | tail -1`
       end
 
-    if args[:branch].empty? && latest_release.empty?
+    if (args[:branch].nil? || args[:branch].empty?) && latest_release.empty?
       skipped << project
-    elsif args[:branch].empty?
+    elsif args[:branch].nil? || args[:branch].empty?
       projects[project] = latest_release
     else
       projects[project] = args[:branch]

diff --git a/ci/script/predicate_functions.sh b/ci/script/predicate_functions.sh
@@ -109,13 +109,8 @@ function is_ruby_31_plus {
 }
 
 function rspec_rails_compatible {
-  if is_ruby_25_plus; then
-    # TODO remove when RSpec-Rails build is 3.1 safe by default
-    if is_ruby_31_plus; then
-      return 1
-    else
-      return 0
-    fi
+  if is_ruby_27_plus; then
+    return 0
   else
     return 1
   fi