From 34cd885db6a29062d5f910fd6d9706b988527fc6 Mon Sep 17 00:00:00 2001
From: Darius Schneider <schneider@itc.rwth-aachen.de>
Date: Thu, 24 Apr 2025 12:30:46 +0200
Subject: [PATCH] CI update
---
rails/gitlab-ci.yml | 6 +++---
rails/rubocop-for-gem.yml | 3 ++-
rails/rubocop.yml | 11 +++++++++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/rails/gitlab-ci.yml b/rails/gitlab-ci.yml
index 3c9bd4b..d17ce5f 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.75.2 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 --silent
+ - gem install rubocop:1.75.3 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 --silent
- gem install itc-gem_rubocop:0.1.3 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent
- rubocop
@@ -30,7 +30,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.75.2 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 erb_lint:0.9.0 --silent
+ - gem install rubocop:1.75.3 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 erb_lint:0.9.0 --silent
- gem install itc-gem_rubocop:0.1.3 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent
- erb_lint --lint-all --allow-no-files true
@@ -42,7 +42,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.75.2 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 haml_lint:0.62.0 --silent
+ - gem install rubocop:1.75.3 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 haml_lint:0.62.0 --silent
- gem install itc-gem_rubocop:0.1.3 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent
- haml-lint
diff --git a/rails/rubocop-for-gem.yml b/rails/rubocop-for-gem.yml
index 91de816..3de551f 100644
--- a/rails/rubocop-for-gem.yml
+++ b/rails/rubocop-for-gem.yml
@@ -3,7 +3,7 @@ inherit_from: "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/
plugins:
- rubocop-packaging
-# gem "rubocop", "1.75.2", require: false
+# gem "rubocop", "1.75.3", require: false
# gem "rubocop-minitest", "0.38.0", require: false
# gem "rubocop-packaging", "0.6.0", require: false
# gem "rubocop-performance", "1.25.0", require: false
@@ -16,6 +16,7 @@ Gemspec/RequireMFA:
Enabled: false
# END Gemspec
+
# BEGIN Naming
# the default gem module must be named like the gem, so allow dashes
Naming/FileName:
diff --git a/rails/rubocop.yml b/rails/rubocop.yml
index 736523e..f4b56af 100644
--- a/rails/rubocop.yml
+++ b/rails/rubocop.yml
@@ -4,14 +4,21 @@ plugins:
- itc-gem_rubocop
- rubocop-capybara
-# gem "itc-gem_rubocop", "0.1.0", require: false
-# gem "rubocop", "1.75.2", require: false
+# gem "itc-gem_rubocop", "0.1.3", require: false
+# gem "rubocop", "1.75.3", require: false
# gem "rubocop-capybara", "2.22.1", require: false
# gem "rubocop-minitest", "0.38.0", require: false
# gem "rubocop-performance", "1.25.0", require: false
# gem "rubocop-rails", "2.31.0", require: false
# BEGIN Customizations
+# BEGIN Rails
+# disable Rails/ContentTag in favor of ItcGemRubocop/ContentTag
+Rails/ContentTag:
+ Enabled: false
+# END Rails
+
+
# BEGIN Style
# prefer compact style, since Zeitwerk handles initialization of modules
Style/ClassAndModuleChildren:
--
GitLab