From 28e8654aa523838b601898fdac3f02eeb1539827 Mon Sep 17 00:00:00 2001 From: Darius Schneider <schneider@itc.rwth-aachen.de> Date: Fri, 7 Mar 2025 21:34:27 +0100 Subject: [PATCH] update config --- rails/gitlab-ci.yml | 6 +++--- rails/rubocop-for-gem.yml | 9 +++++---- rails/rubocop.yml | 10 +++++----- rails/rubocop/rubocop-base.yml | 6 +++--- rails/rubocop/rubocop-minitest.yml | 6 +++--- rails/rubocop/rubocop-rails.yml | 6 +++--- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/rails/gitlab-ci.yml b/rails/gitlab-ci.yml index 961ef2e..4c4f8dc 100644 --- a/rails/gitlab-ci.yml +++ b/rails/gitlab-ci.yml @@ -18,7 +18,7 @@ rubocop: - rails script: - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/rubocop.yml" -O ".rubocop.yml" - - gem install rubocop:1.71.0 rubocop-capybara:2.21.0 rubocop-minitest:0.36.0 rubocop-performance:1.23.1 rubocop-rails:2.29.1 --silent + - gem install rubocop:1.73.2 rubocop-capybara:2.21.0 rubocop-minitest:0.37.1 rubocop-performance:1.24.0 rubocop-rails:2.30.3 --silent - rubocop erb_lint: @@ -29,7 +29,7 @@ erb_lint: script: - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/rubocop.yml" -O ".rubocop.yml" - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/erb_lint.yml" -O ".erb_lint.yml" - - gem install rubocop:1.71.0 rubocop-capybara:2.21.0 rubocop-minitest:0.36.0 rubocop-performance:1.23.1 rubocop-rails:2.29.1 erb_lint:0.9.0 --silent + - gem install rubocop:1.73.2 rubocop-capybara:2.21.0 rubocop-minitest:0.37.1 rubocop-performance:1.24.0 rubocop-rails:2.30.3 erb_lint:0.9.0 --silent - erb_lint --lint-all --allow-no-files true haml_lint: @@ -40,7 +40,7 @@ haml_lint: script: - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/rubocop.yml" -O ".rubocop.yml" - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/haml-lint.yml" -O ".haml-lint.yml" - - gem install rubocop:1.71.0 rubocop-capybara:2.21.0 rubocop-minitest:0.36.0 rubocop-performance:1.23.1 rubocop-rails:2.29.1 haml_lint:0.59.0 --silent + - gem install rubocop:1.73.2 rubocop-capybara:2.21.0 rubocop-minitest:0.37.1 rubocop-performance:1.24.0 rubocop-rails:2.30.3 haml_lint:0.61.0 --silent - haml-lint brakeman: diff --git a/rails/rubocop-for-gem.yml b/rails/rubocop-for-gem.yml index 62a64e8..a1eeddb 100644 --- a/rails/rubocop-for-gem.yml +++ b/rails/rubocop-for-gem.yml @@ -1,13 +1,14 @@ -require: +plugins: - rubocop-minitest - rubocop-packaging - rubocop-performance - rubocop-rails -# gem "rubocop", "1.71.0", require: false -# gem "rubocop-minitest", "0.36.0", require: false -# gem "rubocop-performance", "1.23.1", require: false +# gem "rubocop", "1.73.2", require: false +# gem "rubocop-minitest", "0.37.1", require: false # gem "rubocop-packaging", "0.5.2", require: false +# gem "rubocop-performance", "1.24.0", require: false +# gem "rubocop-rails", "2.30.3", require: false AllCops: NewCops: enable # pending cops get enabled by default and must be disabled by hand, if needed diff --git a/rails/rubocop.yml b/rails/rubocop.yml index a54128b..c0a8e20 100644 --- a/rails/rubocop.yml +++ b/rails/rubocop.yml @@ -1,14 +1,14 @@ -require: +plugins: - rubocop-capybara - rubocop-minitest - rubocop-performance - rubocop-rails -# gem "rubocop", "1.71.0", require: false +# gem "rubocop", "1.73.2", require: false # gem "rubocop-capybara", "2.21.0", require: false -# gem "rubocop-minitest", "0.36.0", require: false -# gem "rubocop-performance", "1.23.1", require: false -# gem "rubocop-rails", "2.29.1", require: false +# gem "rubocop-minitest", "0.37.1", require: false +# gem "rubocop-performance", "1.24.0", require: false +# gem "rubocop-rails", "2.30.3", require: false AllCops: NewCops: enable # pending cops get enabled by default and must be disabled by hand, if needed diff --git a/rails/rubocop/rubocop-base.yml b/rails/rubocop/rubocop-base.yml index 35d1a46..a007554 100644 --- a/rails/rubocop/rubocop-base.yml +++ b/rails/rubocop/rubocop-base.yml @@ -1,8 +1,8 @@ -require: +plugins: - rubocop-performance -# gem 'rubocop', '1.71.0', require: false -# gem 'rubocop-performance', '1.23.1', require: false +# gem 'rubocop', '1.73.2', require: false +# gem 'rubocop-performance', '1.24.0', require: false AllCops: NewCops: enable # pending cops get enabled by default and must be disabled by hand, if needed diff --git a/rails/rubocop/rubocop-minitest.yml b/rails/rubocop/rubocop-minitest.yml index b77e842..a6f453f 100644 --- a/rails/rubocop/rubocop-minitest.yml +++ b/rails/rubocop/rubocop-minitest.yml @@ -1,8 +1,8 @@ -require: +plugins: - rubocop-minitest -# gem 'rubocop', '1.71.0', require: false -# gem 'rubocop-minitest', '0.36.0', require: false +# gem 'rubocop', '1.73.2', require: false +# gem 'rubocop-minitest', '0.37.1', require: false AllCops: NewCops: enable # pending cops get enabled by default and must be disabled by hand, if needed diff --git a/rails/rubocop/rubocop-rails.yml b/rails/rubocop/rubocop-rails.yml index 850af51..391bfb2 100644 --- a/rails/rubocop/rubocop-rails.yml +++ b/rails/rubocop/rubocop-rails.yml @@ -1,8 +1,8 @@ -require: +plugins: - rubocop-rails -# gem 'rubocop', '1.71.0', require: false -# gem 'rubocop-rails', '2.29.1', require: false +# gem 'rubocop', '1.73.2', require: false +# gem 'rubocop-rails', '2.30.3', require: false AllCops: NewCops: enable # pending cops get enabled by default and must be disabled by hand, if needed -- GitLab