From 7fd6cdd382a08813593bbc97b80ca03a315c7b0d Mon Sep 17 00:00:00 2001 From: Hermann Mayer Date: Mon, 11 Mar 2024 08:43:55 +0100 Subject: [PATCH] Updated the actions/checkout version. Signed-off-by: Hermann Mayer --- .github/workflows/documentation.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- Makefile | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 31e3f0d..a6d8ed8 100644 --- 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 index a43f16d..7cf61fb 100644 --- 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 index 097a528..f6e6fa0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: matrix: ruby: ['2.5', '2.7'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install the correct Ruby version uses: ruby/setup-ruby@v1 diff --git a/Makefile b/Makefile index 1f7a9cc..d030b37 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ GREP ?= grep ID ?= id MKDIR ?= mkdir RM ?= rm +TEST ?= test XARGS ?= xargs # Container binaries @@ -33,6 +34,7 @@ RAKE ?= rake RSPEC ?= rspec RUBOCOP ?= rubocop YARD ?= yard +RUBY_VERSION := ruby-version # Define a generic shell run wrapper # $1 - The command to run @@ -98,7 +100,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