Updated the actions/checkout version.

Signed-off-by: Hermann Mayer <[email protected]>
hausgold · Mar 11, 2024 · 5489569 · 5489569
1 parent 5e90bdb
commit 5489569
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install the correct Ruby version
         uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Ruby 2.5
         uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install the correct Ruby version
         uses: ruby/setup-ruby@v1

diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,9 @@ gemspec
 gem 'appraisal', '~> 2.4'
 gem 'bundler', '~> 2.3'
 gem 'countless', '~> 1.1'
-gem 'factory_bot', '~> 6.2'
+# TODO: Remove the upper lock when
+#       https://github.com/thoughtbot/factory_bot/issues/1614 is solved.
+gem 'factory_bot', '~> 6.2', '< 6.4.5'
 gem 'guard-rspec', '~> 4.7'
 gem 'railties', '>= 5.2'
 gem 'rake', '~> 13.0'

diff --git a/Makefile b/Makefile
@@ -25,6 +25,7 @@ ID ?= id
 MKDIR ?= mkdir
 RM ?= rm
 XARGS ?= xargs
+TEST ?= test
 
 # Container binaries
 APPRAISAL ?= appraisal
@@ -35,6 +36,7 @@ RAKE ?= rake
 RSPEC ?= rspec
 RUBOCOP ?= rubocop
 YARD ?= yard
+RUBY_VERSION := ruby-version
 
 # Files
 GEMFILES ?= $(subst _,-,$(patsubst $(GEMFILES_DIR)/%.gemfile,%,\
@@ -113,7 +115,8 @@ test-style: \
 
 test-style-ruby:
 	# Run the static code analyzer (rubocop)
-	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a)
+	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a \
+		|| ($(TEST) $$($(RUBY_VERSION)) != '2.5' && true))
 
 clean:
 	# Clean the dependencies

diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "appraisal", "~> 2.4"
 gem "bundler", "~> 2.3"
 gem "countless", "~> 1.1"
-gem "factory_bot", "~> 6.2"
+gem "factory_bot", "~> 6.2", "< 6.4.5"
 gem "guard-rspec", "~> 4.7"
 gem "railties", "~> 5.2.0"
 gem "rake", "~> 13.0"