From 6d72dd8784b72e20422ce56bf007732f1260873d Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Mon, 22 Jan 2024 10:03:50 +0530 Subject: [PATCH] (vanagon-238) Fixed rubocop offences and fix workflow issue --- .github/workflows/ruby.yml | 2 +- .rubocop.yml | 2 +- lib/vanagon/platform.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index f8827c19..2a3062a9 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -15,6 +15,6 @@ jobs: ruby-version: '2.7' - name: Build and test with Rake run: | - gem install bundler + gem install bundler -v 2.4.22 bundle install --jobs 4 --retry 3 bundle exec rake diff --git a/.rubocop.yml b/.rubocop.yml index 3535961e..5180d598 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -288,7 +288,7 @@ Lint/SuppressedException: Enabled: true Lint/SymbolConversion: - Enabled: true + Enabled: false Lint/ToEnumArguments: Enabled: true diff --git a/lib/vanagon/platform.rb b/lib/vanagon/platform.rb index 8c704036..7af32c9b 100644 --- a/lib/vanagon/platform.rb +++ b/lib/vanagon/platform.rb @@ -474,7 +474,7 @@ def is_windows? # # @return [true, false] true if it is a linux variety, false otherwise def is_linux? - return (!is_windows? && !is_unix?) + !is_windows? && !is_unix? end # Utility matcher to determine if the platform is a cross-compiled variety @@ -490,7 +490,7 @@ def is_cross_compiled? # # @return [true, false] true if it is a cross-compiled Linux variety, false otherwise def is_cross_compiled_linux? - return (is_cross_compiled? && is_linux?) + is_cross_compiled? && is_linux? end # Pass in a packaging override. This needs to be implemented for each