From 62bd2aca04f7619c608ad57ad7e5666db7d05371 Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovaznik@gitlab.com>
Date: Tue, 18 Sep 2018 20:00:30 +0200
Subject: Switch rails 4 to 5 in gitlab-ci

CI jobs will be triggered both with rails 4 and 5
to make sure we keep backward compatibility if it turns out
we have to switch back to rails 4.

Rails 4 jobs are not allowed to fail for now, these jobs will be
removed in a follow-up MR next cycle.
---
 scripts/rails4-gemfile-lock-check | 19 +++++++++++++++++++
 scripts/rails5-gemfile-lock-check | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100755 scripts/rails4-gemfile-lock-check
 delete mode 100755 scripts/rails5-gemfile-lock-check

(limited to 'scripts')

diff --git a/scripts/rails4-gemfile-lock-check b/scripts/rails4-gemfile-lock-check
new file mode 100755
index 00000000000..a74a49874e1
--- /dev/null
+++ b/scripts/rails4-gemfile-lock-check
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+echo -e "=> Checking if Gemfile.rails4.lock is up-to-date...\\n"
+
+cp Gemfile.rails4.lock Gemfile.rails4.lock.orig
+BUNDLE_GEMFILE=Gemfile.rails4 bundle install "$BUNDLE_INSTALL_FLAGS"
+diff -u Gemfile.rails4.lock.orig Gemfile.rails4.lock >/dev/null 2>&1
+
+if [ $? == 1 ]
+then
+  diff -u Gemfile.rails4.lock.orig Gemfile.rails4.lock
+
+  echo -e "\\n✖ ERROR: Gemfile.rails4.lock is not up-to-date!
+         Please run 'BUNDLE_GEMFILE=Gemfile.rails4 bundle install'\\n" >&2
+  exit 1
+fi
+
+echo "✔ Gemfile.rails4.lock is up-to-date"
+exit 0
diff --git a/scripts/rails5-gemfile-lock-check b/scripts/rails5-gemfile-lock-check
deleted file mode 100755
index da6f1b7145e..00000000000
--- a/scripts/rails5-gemfile-lock-check
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
-- 
cgit v1.2.1