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

.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:

changelogs/unreleased/blackst0ne-add-gemfile-rails5-lock-check.yml

+---
+title: Add CI job to check Gemfile.rails5.lock
+merge_request: 19605
+author: "@blackst0ne"
+type: other

scripts/rails5-gemfile-lock-check

+#!/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