diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 15:06:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 15:06:46 +0300 |
commit | 30acb0522a609c438d60f5345243e96f9a041ae6 (patch) | |
tree | ce1b11d55c510996e3ebe9a5e96db5fd08dbeaf2 /vendor | |
parent | d2485dbfedc4759eba5243e0d155e34494c4429b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gems/attr_encrypted/.gitlab-ci.yml | 26 | ||||
-rw-r--r-- | vendor/gems/bundler-checksum/.gitlab-ci.yml | 26 | ||||
-rw-r--r-- | vendor/gems/cloud_profiler_agent/.gitlab-ci.yml | 37 | ||||
-rw-r--r-- | vendor/gems/devise-pbkdf2-encryptable/.gitlab-ci.yml | 33 | ||||
-rw-r--r-- | vendor/gems/gitlab_active_record/.gitlab-ci.yml | 33 | ||||
-rw-r--r-- | vendor/gems/ipynbdiff/.gitlab-ci.yml | 42 | ||||
-rw-r--r-- | vendor/gems/mail-smtp_pool/.gitlab-ci.yml | 36 | ||||
-rw-r--r-- | vendor/gems/microsoft_graph_mailer/.gitlab-ci.yml | 37 | ||||
-rw-r--r-- | vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml | 41 | ||||
-rw-r--r-- | vendor/gems/omniauth-gitlab/.gitlab-ci.yml | 41 | ||||
-rw-r--r-- | vendor/gems/omniauth-salesforce/.gitlab-ci.yml | 41 | ||||
-rw-r--r-- | vendor/gems/omniauth_crowd/.gitlab-ci.yml | 41 | ||||
-rw-r--r-- | vendor/gems/sidekiq-reliable-fetch/.gitlab-ci.yml | 83 |
13 files changed, 103 insertions, 414 deletions
diff --git a/vendor/gems/attr_encrypted/.gitlab-ci.yml b/vendor/gems/attr_encrypted/.gitlab-ci.yml index 7d954de43a0..c285eef6e64 100644 --- a/vendor/gems/attr_encrypted/.gitlab-ci.yml +++ b/vendor/gems/attr_encrypted/.gitlab-ci.yml @@ -1,26 +1,12 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -default: - image: "ruby:${RUBY_VERSION}" +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "attr_encrypted" + gem_path_prefix: "vendor/gems/" rspec: - cache: - key: attr_encrypted-ruby - paths: - - vendor/gems/attr_encrypted/vendor/ruby - before_script: - - cd vendor/gems/attr_encrypted - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' # This is set to 'deployment' otherwise - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) script: - bundle exec rake test parallel: matrix: - - RUBY_VERSION: ["2.7", "3.0", "3.1"] + - RUBY_VERSION: ["3.0", "3.1"] # 3.2 isn't supported yet diff --git a/vendor/gems/bundler-checksum/.gitlab-ci.yml b/vendor/gems/bundler-checksum/.gitlab-ci.yml index 2de1c5e982c..0ec9a5d94f1 100644 --- a/vendor/gems/bundler-checksum/.gitlab-ci.yml +++ b/vendor/gems/bundler-checksum/.gitlab-ci.yml @@ -1,24 +1,10 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "bundler-checksum" + gem_path_prefix: "vendor/gems/" rspec: - image: "ruby:${RUBY_VERSION}" - cache: - key: bundler-checksum - paths: - - vendor/gems/bundler-checksum/vendor/ruby - before_script: - - cd vendor/gems/bundler-checksum - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) + extends: .ruby_matrix script: - pushd test/project_with_checksum_lock && scripts/test - parallel: - matrix: - - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"] diff --git a/vendor/gems/cloud_profiler_agent/.gitlab-ci.yml b/vendor/gems/cloud_profiler_agent/.gitlab-ci.yml index 9e508d920e8..aa4638486e5 100644 --- a/vendor/gems/cloud_profiler_agent/.gitlab-ci.yml +++ b/vendor/gems/cloud_profiler_agent/.gitlab-ci.yml @@ -1,32 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: cloud_profiler_agent-ruby-${RUBY_VERSION} - paths: - - vendor/gems/cloud_profiler_agent/vendor/ruby - before_script: - - cd vendor/gems/cloud_profiler_agent - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec - -rspec-3.1: - image: "ruby:3.1" - extends: .rspec - -rspec-3.2: - image: "ruby:3.2" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "cloud_profiler_agent" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/devise-pbkdf2-encryptable/.gitlab-ci.yml b/vendor/gems/devise-pbkdf2-encryptable/.gitlab-ci.yml index ed5e27f5a8c..c8698943ca9 100644 --- a/vendor/gems/devise-pbkdf2-encryptable/.gitlab-ci.yml +++ b/vendor/gems/devise-pbkdf2-encryptable/.gitlab-ci.yml @@ -1,28 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: devise-pbkdf2-encryptable - paths: - - vendor/gems/devise-pbkdf2-encryptable/vendor/ruby - before_script: - - cd vendor/gems/devise-pbkdf2-encryptable - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "devise-pbkdf2-encryptable" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/gitlab_active_record/.gitlab-ci.yml b/vendor/gems/gitlab_active_record/.gitlab-ci.yml index a1e883119e8..a9bc04659d7 100644 --- a/vendor/gems/gitlab_active_record/.gitlab-ci.yml +++ b/vendor/gems/gitlab_active_record/.gitlab-ci.yml @@ -1,28 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: gitlab_active_record-ruby - paths: - - vendor/gems/gitlab_active_record/vendor/ruby - before_script: - - cd vendor/gems/gitlab_active_record - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "gitlab_active_record" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/ipynbdiff/.gitlab-ci.yml b/vendor/gems/ipynbdiff/.gitlab-ci.yml index bf8f8b15c26..dd8f61050bb 100644 --- a/vendor/gems/ipynbdiff/.gitlab-ci.yml +++ b/vendor/gems/ipynbdiff/.gitlab-ci.yml @@ -1,34 +1,10 @@ -# You can override the included template(s) by including variable overrides -# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings -# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings -# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings -# Note that environment variables can be set in several places -# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "ipynbdiff" + gem_path_prefix: "vendor/gems/" -.rspec: - cache: - key: ipynbdiff - paths: - - vendor/gems/ipynbdiff/vendor/ruby - before_script: - - cd vendor/gems/ipynbdiff - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec +rspec: + parallel: + matrix: + - RUBY_VERSION: ["3.0", "3.1"] # 3.2 isn't supported yet diff --git a/vendor/gems/mail-smtp_pool/.gitlab-ci.yml b/vendor/gems/mail-smtp_pool/.gitlab-ci.yml index dee865f3cd6..260bc1aaa1f 100644 --- a/vendor/gems/mail-smtp_pool/.gitlab-ci.yml +++ b/vendor/gems/mail-smtp_pool/.gitlab-ci.yml @@ -1,28 +1,10 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "mail-smtp_pool" + gem_path_prefix: "vendor/gems/" -.rspec: - cache: - key: mail-smtp_pool-ruby - paths: - - vendor/gems/mail-smtp_pool/vendor/ruby - before_script: - - cd vendor/gems/mail-smtp_pool - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec +rspec: + parallel: + matrix: + - RUBY_VERSION: ["3.0"] # 3.1 & 3.2 aren't supported yet diff --git a/vendor/gems/microsoft_graph_mailer/.gitlab-ci.yml b/vendor/gems/microsoft_graph_mailer/.gitlab-ci.yml index 1b10debb1b9..d1055958749 100644 --- a/vendor/gems/microsoft_graph_mailer/.gitlab-ci.yml +++ b/vendor/gems/microsoft_graph_mailer/.gitlab-ci.yml @@ -1,32 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: microsoft_graph_mailer-ruby - paths: - - vendor/gems/microsoft_graph_mailer/vendor/ruby - before_script: - - cd vendor/gems/microsoft_graph_mailer - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec - -rspec-3.1: - image: "ruby:3.1" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "microsoft_graph_mailer" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml b/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml index 816b868915f..b49143ebd33 100644 --- a/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml +++ b/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml @@ -1,36 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: omniauth-azure-oauth2 - paths: - - vendor/gems/omniauth-azure-oauth2/vendor/ruby - before_script: - - cd vendor/gems/omniauth-azure-oauth2 - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec - -rspec-3.1: - image: "ruby:3.1" - extends: .rspec - -rspec-3.2: - image: "ruby:3.2" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "omniauth-azure-oauth2" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/omniauth-gitlab/.gitlab-ci.yml b/vendor/gems/omniauth-gitlab/.gitlab-ci.yml index a802029c008..10382723643 100644 --- a/vendor/gems/omniauth-gitlab/.gitlab-ci.yml +++ b/vendor/gems/omniauth-gitlab/.gitlab-ci.yml @@ -1,36 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: omniauth-gitlab-ruby - paths: - - vendor/gems/omniauth-gitlab/vendor/ruby - before_script: - - cd vendor/gems/omniauth-gitlab - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec - -rspec-3.1: - image: "ruby:3.1" - extends: .rspec - -rspec-3.2: - image: "ruby:3.2" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "omniauth-gitlab" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/omniauth-salesforce/.gitlab-ci.yml b/vendor/gems/omniauth-salesforce/.gitlab-ci.yml index 15e7392e46b..bd630fbdcd0 100644 --- a/vendor/gems/omniauth-salesforce/.gitlab-ci.yml +++ b/vendor/gems/omniauth-salesforce/.gitlab-ci.yml @@ -1,36 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: omniauth-salesforce - paths: - - vendor/gems/omniauth-salesforce/vendor/ruby - before_script: - - cd vendor/gems/omniauth-salesforce - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec - -rspec-3.1: - image: "ruby:3.1" - extends: .rspec - -rspec-3.2: - image: "ruby:3.2" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "omniauth-salesforce" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/omniauth_crowd/.gitlab-ci.yml b/vendor/gems/omniauth_crowd/.gitlab-ci.yml index ddc5d2fa5c3..9265f7a04a0 100644 --- a/vendor/gems/omniauth_crowd/.gitlab-ci.yml +++ b/vendor/gems/omniauth_crowd/.gitlab-ci.yml @@ -1,36 +1,5 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -.rspec: - cache: - key: omniauth_crowd - paths: - - vendor/gems/omniauth_crowd/vendor/ruby - before_script: - - cd vendor/gems/omniauth_crowd - - ruby -v # Print out ruby version for debugging - - gem install bundler --no-document # Bundler is not installed with the image - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install -j $(nproc) - script: - - bundle exec rspec - -rspec-2.7: - image: "ruby:2.7" - extends: .rspec - -rspec-3.0: - image: "ruby:3.0" - extends: .rspec - -rspec-3.1: - image: "ruby:3.1" - extends: .rspec - -rspec-3.2: - image: "ruby:3.2" - extends: .rspec +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "omniauth_crowd" + gem_path_prefix: "vendor/gems/" diff --git a/vendor/gems/sidekiq-reliable-fetch/.gitlab-ci.yml b/vendor/gems/sidekiq-reliable-fetch/.gitlab-ci.yml index fdf9ccdeb55..9df01687447 100644 --- a/vendor/gems/sidekiq-reliable-fetch/.gitlab-ci.yml +++ b/vendor/gems/sidekiq-reliable-fetch/.gitlab-ci.yml @@ -1,71 +1,54 @@ -workflow: - rules: - - if: $CI_MERGE_REQUEST_ID - -default: - image: ruby:3.0 - -before_script: - - cd vendor/gems/sidekiq-reliable-fetch - - ruby -v - - which ruby - - gem install bundler - - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby - - bundle config set with 'development' # This is set to 'deployment' otherwise - - bundle config set --local frozen 'true' # Disallow Gemfile.lock changes on CI - - bundle config # Show bundler configuration - - bundle install --jobs $(nproc) "${FLAGS[@]}" - -variables: - REDIS_URL: "redis://redis" +include: + - local: gems/gem.gitlab-ci.yml + inputs: + gem_name: "sidekiq-reliable-fetch" + gem_path_prefix: "vendor/gems/" rspec: - stage: test - coverage: '/LOC \((\d+\.\d+%)\) covered.$/' - script: - - bundle exec rspec + extends: + - .with_redis + parallel: + matrix: + - RUBY_VERSION: ["3.0", "3.1"] # 3.2 isn't supported yet + +.with_redis: services: - redis:alpine - artifacts: - expire_in: 31d - when: always - paths: - - coverage/ + variables: + REDIS_URL: "redis://redis" -.integration: - stage: test +.reliability: + extends: + - .with_redis + - .ruby_matrix script: - cd tests/reliability - bundle exec ruby reliability_test.rb - services: - - redis:alpine integration_semi: - extends: .integration + extends: .reliability variables: JOB_FETCHER: semi integration_reliable: - extends: .integration + extends: .reliability variables: JOB_FETCHER: reliable -kill_interruption: - stage: test +.interruption: + extends: + - .with_redis + - .ruby_matrix script: - cd tests/interruption - - bundle exec ruby test_kill_signal.rb - services: - - redis:alpine + - bundle exec ruby "test_${SIGNAL}_signal.rb" -term_interruption: - stage: test - script: - - cd tests/interruption - - bundle exec ruby test_term_signal.rb - services: - - redis:alpine +kill_interruption: + extends: .interruption + variables: + SIGNAL: kill -# rubocop: -# script: -# - bundle exec rubocop +term_interruption: + extends: .interruption + variables: + SIGNAL: term |