Makefile in rimless-1.5.0 vs Makefile in rimless-1.5.1

- old
+ new

@@ -23,20 +23,22 @@ GREP ?= grep ID ?= id MKDIR ?= mkdir RM ?= rm XARGS ?= xargs +TEST ?= test # Container binaries APPRAISAL ?= appraisal BUNDLE ?= bundle GEM ?= gem GUARD ?= guard RAKE ?= rake RSPEC ?= rspec RUBOCOP ?= rubocop YARD ?= yard +RUBY_VERSION := ruby-version # Files GEMFILES ?= $(subst _,-,$(patsubst $(GEMFILES_DIR)/%.gemfile,%,\ $(wildcard $(GEMFILES_DIR)/*.gemfile))) TEST_GEMFILES := $(GEMFILES:%=test-%) @@ -111,10 +113,11 @@ test-style: \ test-style-ruby 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 @$(RM) -rf $(VENDOR_DIR) @$(RM) -rf $(VENDOR_DIR)/Gemfile.lock