gitlab-dangerfiles 4.4.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba5fe5b513843f893ab44f12950f4e870d37b331b8e43e50e884498cf924acb
-  data.tar.gz: b9f57ccf7cdc4e41cf9fa6af85ec314c83e5e07f4dd00f062251b492aa50d573
+  metadata.gz: 501394f58303715430e058da5fbc46a6c539136b8a888ed22521ab56da6595c3
+  data.tar.gz: 520c933eb21695e1cdc9e74cea42ec1e636b08455377d2b9dc3ebafe405977ac
 SHA512:
-  metadata.gz: 83776a852572740d36b35eb3a7080faef40f5237434004f0767b26ce61979bd664bf8e4fdd86ed3280e0d678273431c7b4f485b814fd9ec96c46905ba16503ec
-  data.tar.gz: e6e60640c4e5caa08e2f82350deb39fa349b44295b2677965638f4cdf36ee7067bcbff4bfa80c1ab305067335c13e074bd0e7a69a1626ae82aa9d132b43f1277
+  metadata.gz: 5d68efa303d47210a6e1d126d9e7706f8872ae61a5a24dacce6b6a48242f8e9d0854f8067d35c64e6340602768e4ed65bd1fcfab71f7447798576172095497bc
+  data.tar.gz: 79b38327e2b8a133c58124952b2ff371cb551fde1d61aeb29b5f67d29ee212f93c1c423842121f0247304af52414efd5e690d3fa1c4e50083a9dfacdca7f4d33

data/.gitlab-ci.yml

@@ -2,6 +2,9 @@ stages:
   - test
   - deploy
 
+variables:
+  DEFAULT_CI_IMAGE: "ruby:${RUBY_VERSION}"
+
 workflow:
   rules:
     # For merge requests, create a pipeline.
@@ -11,8 +14,8 @@ workflow:
     # For tags, create a pipeline.
     - if: '$CI_COMMIT_TAG'
 
-.default:
-  image: "ruby:${RUBY_VERSION}"
+default:
+  image: "${DEFAULT_CI_IMAGE}"
   tags:
     - gitlab-org
   before_script:
@@ -28,23 +31,22 @@ workflow:
       - Gemfile.lock
     policy: pull
 
-test:rspec:
-  extends: .default
+.default-test-job:
   stage: test
-  script:
-    - bundle exec rspec
+  needs: []
   parallel:
     matrix:
       - RUBY_VERSION: ['3.0', '3.1', '3.2']
 
+test:rspec:
+  extends: .default-test-job
+  script:
+    - bundle exec rspec
+
 test:rubocop:
-  extends: .default
-  stage: test
+  extends: .default-test-job
   script:
     - bundle exec rubocop -P -E .
-  parallel:
-    matrix:
-      - RUBY_VERSION: ['3.0', '3.1', '3.2']
 
 include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml
@@ -53,7 +55,9 @@ include:
   - project: 'gitlab-org/quality/pipeline-common'
     file:
       - '/ci/danger-review.yml'
-      - '/ci/gem-release.yml'
+  - component: "gitlab.com/gitlab-org/quality/pipeline-common/gem-release@7.6.1"
+    inputs:
+      smoke_test_script: "ruby -r 'gitlab-dangerfiles' -e \"puts Gitlab::Dangerfiles::VERSION\""
 
 # run security jobs on MRs
 # see: https://gitlab.com/gitlab-org/gitlab/-/issues/218444#note_478761991

data/gitlab-dangerfiles.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   # we do not commit the bundle lockfile, so this temporary workaround needs to be
   # present until 2.21.3 or 2.22.x is released
   # See https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/issues/63
-  spec.add_development_dependency "rubocop-rails", "!= 2.21.2"
+  spec.add_development_dependency "rubocop-rails", "< 2.21.2"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"

data/lib/danger/plugins/internal/helper.rb

@@ -21,9 +21,8 @@ module Danger
       ux: "~UX",
       codeowners: '~"Code Owners"',
       test: "~test for `spec/features/*`",
-      # Deprecated as of 2.3.0 in favor of tooling
-      engineering_productivity: '~"Engineering Productivity" for CI, Danger',
-      tooling: '~"maintenance::workflow" / ~"maintenance::pipelines" for CI, Danger',
+      tooling: '~"maintenance::workflow" for tooling, Danger, and RuboCop',
+      pipeline: '~"maintenance::pipelines" for CI',
       ci_template: '~"ci::templates"',
       analytics_instrumentation: '~"analytics instrumentation"',
       import_integrate_be: '~"group::import and integrate" (backend)',

data/lib/danger/plugins/roulette.rb

@@ -91,7 +91,7 @@ module Danger
             # Fetch an already picked backend reviewer, or pick one otherwise
             spin.reviewer = backend_spin&.reviewer || spin_for_category(project, :backend).reviewer
           end
-        when :tooling, :engineering_productivity # Deprecated as of 2.3.0 in favor of tooling
+        when :tooling
           if spin.maintainer.nil?
             # Fetch an already picked backend maintainer, or pick one otherwise
             spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend).maintainer

data/lib/danger/rules/z_add_labels/Dangerfile

@@ -9,7 +9,7 @@ def post_labels(labels)
     helper.mr_iid,
     add_labels: labels.join(","))
 rescue Gitlab::Error::Forbidden
-  warn("This Merge Request needs to be labelled with #{helper.labels_list(labels)}. Please request a reviewer or maintainer to add them.")
+  warn("Labels missing: please ask a reviewer or maintainer to add #{helper.labels_list(labels)} to this merge request.")
 end
 
 post_labels(helper.labels_to_add) if helper.labels_to_add.any?

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "4.4.0"
+    VERSION = "4.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.6.0
 platform: ruby
 authors:
 - GitLab
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,14 +140,14 @@ dependencies:
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.21.2
 - !ruby/object:Gem::Dependency
@@ -263,7 +263,7 @@ metadata:
   homepage_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles
   source_code_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles
   changelog_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,8 +278,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: This gem provides common Dangerfile and plugins for GitLab projects.
 test_files: []