diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-07 21:15:06 +0300 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-14 21:36:22 +0300 |
| commit | 44fef4fe4cb9d4f30f129ff5a548395bc924c8fe (patch) | |
| tree | ac5e97a16658edfb25b8407f1cf2d9a11c172667 /.gitlab-ci.yml | |
| parent | eafc8e2f481751b973260287c844b70bd408dcb2 (diff) | |
Remove rails 4 support in CI, Gemfiles, bin/ and config/
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b26c2d16d77..2c3d18d21be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,18 +77,6 @@ stages: - mysql:5.7 - redis:alpine -.rails4: &rails4 - allow_failure: false - except: - variables: - - $CI_COMMIT_REF_NAME =~ /(^docs[\/-].*|.*-docs$)/ - - $CI_COMMIT_REF_NAME =~ /(^qa[\/-].*|.*-qa$)/ - - $CI_COMMIT_REF_NAME =~ /norails4/ - - $RAILS5_DISABLED - variables: - BUNDLE_GEMFILE: "Gemfile.rails4" - RAILS5: "false" - # Skip all jobs except the ones that begin with 'docs/'. # Used for commits including ONLY documentation changes. # https://docs.gitlab.com/ce/development/documentation/#testing @@ -180,18 +168,10 @@ stages: <<: *rspec-metadata <<: *use-pg -.rspec-metadata-pg-rails4: &rspec-metadata-pg-rails4 - <<: *rspec-metadata-pg - <<: *rails4 - .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata <<: *use-mysql -.rspec-metadata-mysql-rails4: &rspec-metadata-mysql-rails4 - <<: *rspec-metadata-mysql - <<: *rails4 - .only-canonical-masters: &only-canonical-masters only: - master@gitlab-org/gitlab-ce @@ -432,7 +412,6 @@ setup-test-env: script: - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' - scripts/gitaly-test-build # Do not use 'bundle exec' here - - BUNDLE_GEMFILE=Gemfile.rails4 bundle install $BUNDLE_INSTALL_FLAGS artifacts: expire_in: 7d paths: @@ -513,14 +492,6 @@ rspec-mysql: <<: *rspec-metadata-mysql parallel: 50 -rspec-pg-rails4: - <<: *rspec-metadata-pg-rails4 - parallel: 50 - -rspec-mysql-rails4: - <<: *rspec-metadata-mysql-rails4 - parallel: 50 - static-analysis: <<: *dedicated-no-docs-no-db-pull-cache-job dependencies: @@ -565,12 +536,6 @@ downtime_check: - /(^docs[\/-].*|.*-docs$)/ - /(^qa[\/-].*|.*-qa$)/ -rails4_gemfile_lock_check: - <<: *dedicated-no-docs-no-db-pull-cache-job - <<: *except-docs-and-qa - script: - - scripts/rails4-gemfile-lock-check - ee_compat_check: <<: *rake-exec dependencies: [] |