Makefile in alarmable-1.1.0 vs Makefile in alarmable-1.2.0

- old
+ new

@@ -14,24 +14,35 @@ # Directories VENDOR_DIR ?= vendor/bundle GEMFILES_DIR ?= gemfiles # Host binaries +AWK ?= awk BASH ?= bash COMPOSE ?= docker-compose +CP ?= cp +DOCKER ?= docker +EXPORT ?= export +FIND ?= find +GREP ?= grep +HEAD ?= head ID ?= id MKDIR ?= mkdir RM ?= rm +TEST ?= test +SORT ?= sort +XARGS ?= xargs # Container binaries APPRAISAL ?= appraisal BUNDLE ?= bundle 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-%) @@ -106,10 +117,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.7' && true)) clean: # Clean the dependencies @$(RM) -rf $(VENDOR_DIR) @$(RM) -rf $(GEMFILES_DIR)/vendor