diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-12 11:23:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-12 11:23:58 +0000 |
| commit | 5d51bd170b192654512c339a4774780c00d124ed (patch) | |
| tree | a9fe267877980dc10b7acc6825ecee430e091c82 | |
| parent | 09d0dbb97d32a3150ddb5f8538eace7847c70b2b (diff) | |
| parent | e23fb005cfc6d0d1c0423bed3fa2dcdf291ae196 (diff) | |
| download | gitlab-ce-5d51bd170b192654512c339a4774780c00d124ed.tar.gz | |
Merge branch 'blackst0ne-add-gemfile-rails5-lock-check' into 'master'
Add CI job to check Gemfile.rails5.lock
See merge request gitlab-org/gitlab-ce!19605
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/blackst0ne-add-gemfile-rails5-lock-check.yml | 5 | ||||
| -rwxr-xr-x | scripts/rails5-gemfile-lock-check | 19 |
3 files changed, 31 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba0c5074839..9a0102c65fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,6 +415,7 @@ 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.rails5 bundle install $BUNDLE_INSTALL_FLAGS artifacts: expire_in: 7d paths: @@ -590,6 +591,12 @@ downtime_check: - /(^docs[\/-].*|.*-docs$)/ - /(^qa[\/-].*|.*-qa$)/ +rails5_gemfile_lock_check: + <<: *dedicated-no-docs-no-db-pull-cache-job + <<: *except-docs-and-qa + script: + - scripts/rails5-gemfile-lock-check + ee_compat_check: <<: *rake-exec except: diff --git a/changelogs/unreleased/blackst0ne-add-gemfile-rails5-lock-check.yml b/changelogs/unreleased/blackst0ne-add-gemfile-rails5-lock-check.yml new file mode 100644 index 00000000000..69d49f3e3e0 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-add-gemfile-rails5-lock-check.yml @@ -0,0 +1,5 @@ +--- +title: Add CI job to check Gemfile.rails5.lock +merge_request: 19605 +author: "@blackst0ne" +type: other diff --git a/scripts/rails5-gemfile-lock-check b/scripts/rails5-gemfile-lock-check new file mode 100755 index 00000000000..da6f1b7145e --- /dev/null +++ b/scripts/rails5-gemfile-lock-check @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +echo -e "=> Checking if Gemfile.rails5.lock is up-to-date...\\n" + +cp Gemfile.rails5.lock Gemfile.rails5.lock.orig +BUNDLE_GEMFILE=Gemfile.rails5 bundle install "$BUNDLE_INSTALL_FLAGS" +diff -u Gemfile.rails5.lock.orig Gemfile.rails5.lock >/dev/null 2>&1 + +if [ $? == 1 ] +then + diff -u Gemfile.rails5.lock.orig Gemfile.rails5.lock + + echo -e "\\n✖ ERROR: Gemfile.rails5.lock is not up-to-date! + Please run 'BUNDLE_GEMFILE=Gemfile.rails5 bundle install'\\n" >&2 + exit 1 +fi + +echo "✔ Gemfile.rails5.lock is up-to-date" +exit 0 |