Makefile in billomat-1.1.0 vs Makefile in billomat-1.2.0

- old
+ new

@@ -21,20 +21,22 @@ DOCKER ?= docker GREP ?= grep ID ?= id MKDIR ?= mkdir RM ?= rm +TEST ?= test XARGS ?= xargs # Container binaries BUNDLE ?= bundle GEM ?= gem GUARD ?= guard RAKE ?= rake RSPEC ?= rspec RUBOCOP ?= rubocop YARD ?= yard +RUBY_VERSION := ruby-version # Define a generic shell run wrapper # $1 - The command to run ifeq ($(MAKE_ENV),docker) define run-shell @@ -96,10 +98,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 $(VENDOR_DIR)/Gemfile.lock