diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 03:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 03:09:18 +0300 |
| commit | 0a209fd10ef3cb8b68ca3d8e56a99f67bd6998c1 (patch) | |
| tree | db3d35d2882336d67017a1c3eef98455de068503 /.gitlab | |
| parent | e0e980334d60fc543b77e2c7652eb06b954e1fa8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 2f68897d8cb..f4ea6e3ae01 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -359,32 +359,34 @@ db:check-migrations: - scripts/validate_migration_schema allow_failure: true -db:migrate-from-v12.10.0: - extends: .db-job-base - variables: - SETUP_DB: "false" - script: - - export PROJECT_TO_CHECKOUT="gitlab" - - export TAG_TO_CHECKOUT="v12.10.0-ee" - - '[[ -d "ee/" ]] || export PROJECT_TO_CHECKOUT="gitlab-foss"' - - '[[ -d "ee/" ]] || export TAG_TO_CHECKOUT="v12.10.0"' - - retry 'git fetch https://gitlab.com/gitlab-org/$PROJECT_TO_CHECKOUT.git $TAG_TO_CHECKOUT' - - git checkout -f FETCH_HEAD - - sed -i -e "s/gem 'grpc', '~> 1.24.0'/gem 'grpc', '~> 1.30.2'/" Gemfile # Update gRPC for Ruby 2.7 - - sed -i -e "s/gem 'google-protobuf', '~> 3.8.0'/gem 'google-protobuf', '~> 3.12.0'/" Gemfile - - gem install bundler:1.17.3 - - bundle update google-protobuf grpc bootsnap - - bundle install $BUNDLE_INSTALL_FLAGS - - date - - cp config/gitlab.yml.example config/gitlab.yml - - bundle exec rake db:drop db:create db:structure:load db:seed_fu - - date - - git checkout -f $CI_COMMIT_SHA - - bundle install $BUNDLE_INSTALL_FLAGS - - date - - . scripts/prepare_build.sh - - date - - bundle exec rake db:migrate +# Temporarily disabled due to failures in https://gitlab.com/gitlab-org/gitlab/-/issues/325838 + +# db:migrate-from-v12.10.0: +# extends: .db-job-base +# variables: +# SETUP_DB: "false" +# script: +# - export PROJECT_TO_CHECKOUT="gitlab" +# - export TAG_TO_CHECKOUT="v12.10.0-ee" +# - '[[ -d "ee/" ]] || export PROJECT_TO_CHECKOUT="gitlab-foss"' +# - '[[ -d "ee/" ]] || export TAG_TO_CHECKOUT="v12.10.0"' +# - retry 'git fetch https://gitlab.com/gitlab-org/$PROJECT_TO_CHECKOUT.git $TAG_TO_CHECKOUT' +# - git checkout -f FETCH_HEAD +# - sed -i -e "s/gem 'grpc', '~> 1.24.0'/gem 'grpc', '~> 1.30.2'/" Gemfile # Update gRPC for Ruby 2.7 +# - sed -i -e "s/gem 'google-protobuf', '~> 3.8.0'/gem 'google-protobuf', '~> 3.12.0'/" Gemfile +# - gem install bundler:1.17.3 +# - bundle update google-protobuf grpc bootsnap +# - bundle install $BUNDLE_INSTALL_FLAGS +# - date +# - cp config/gitlab.yml.example config/gitlab.yml +# - bundle exec rake db:drop db:create db:structure:load db:seed_fu +# - date +# - git checkout -f $CI_COMMIT_SHA +# - bundle install $BUNDLE_INSTALL_FLAGS +# - date +# - . scripts/prepare_build.sh +# - date +# - bundle exec rake db:migrate db:rollback: extends: .db-job-base |