From 312731cce0016ddffc7f778e89584c27c3187770 Mon Sep 17 00:00:00 2001
From: Darius Schneider <schneider@itc.rwth-aachen.de>
Date: Thu, 3 Oct 2024 13:18:41 +0200
Subject: [PATCH] Update gitlab-ci.yml

---
 rails/gitlab-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/rails/gitlab-ci.yml b/rails/gitlab-ci.yml
index fea0cb6..db626ad 100644
--- a/rails/gitlab-ci.yml
+++ b/rails/gitlab-ci.yml
@@ -22,9 +22,10 @@ rubocop:
     when: always
     paths:
       - vendor/gems
-  script:
+  before_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.65.1 rubocop-capybara:2.21.0 rubocop-minitest:0.35.1 rubocop-performance:1.21.1 rubocop-rails:2.25.1 --silent
+    - gem install --conservative rubocop:1.65.1 rubocop-capybara:2.21.0 rubocop-minitest:0.35.1 rubocop-performance:1.21.1 rubocop-rails:2.25.1 --silent
+  script:
     - rubocop
 
 erb_lint:
@@ -39,7 +40,7 @@ erb_lint:
   before_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.65.1 rubocop-capybara:2.21.0 rubocop-minitest:0.35.1 rubocop-performance:1.21.1 rubocop-rails:2.25.1 erb_lint:0.6.0 --silent
+    - gem install --conservative rubocop:1.65.1 rubocop-capybara:2.21.0 rubocop-minitest:0.35.1 rubocop-performance:1.21.1 rubocop-rails:2.25.1 erb_lint:0.6.0 --silent
   script:
     - erblint --lint-all --allow-no-files true
 
@@ -55,7 +56,7 @@ haml_lint:
   before_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.65.1 rubocop-capybara:2.21.0 rubocop-minitest:0.35.1 rubocop-performance:1.21.1 rubocop-rails:2.25.1 haml_lint:0.58.0 --silent
+    - gem install --conservative rubocop:1.65.1 rubocop-capybara:2.21.0 rubocop-minitest:0.35.1 rubocop-performance:1.21.1 rubocop-rails:2.25.1 haml_lint:0.58.0 --silent
   script:
     - haml-lint
 
@@ -67,10 +68,10 @@ brakeman:
   cache:
     when: always
     paths:
-      - vendor/gem
+      - vendor/gems
   before_script:
     - rm -f ./config/brakeman.yml ./config/brakeman.ignore
-    - gem install brakeman --silent
+    - gem install --conservative brakeman --silent
   script:
     - brakeman -A --except UnscopedFind
 
-- 
GitLab