summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2020-11-04 08:42:59 +0000
committerTakuya Noguchi <takninnovationresearch@gmail.com>2020-11-04 09:52:04 +0000
commitd837169eafd17dc0f4fd47ae5102ecf709d9f426 (patch)
tree28c38a7517d1ece8559fa9dce6a70e98b29e987b
parentac9fee4d247c8af46c1a3cbaa7c1d453c5267b29 (diff)
downloadgitlab-shell-483-upgrade-bundler-from-1-17-2-to-2-1.tar.gz
Upgrade Bundler from 1.17.2 to 2.1.4483-upgrade-bundler-from-1-17-2-to-2-1
https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/426 https://gitlab.com/groups/gitlab-org/-/epics/2380 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--Gemfile.lock2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b7c2a9..72c171f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ default:
- apt-get update -qq && apt-get install -y ruby ruby-dev
- ruby -v
- export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin
- - gem install --force --bindir /usr/local/bin bundler -v 1.17.2
+ - gem install --force --bindir /usr/local/bin bundler -v 2.1.4
- bundle install
# Now set up to run the Golang tests
- make build
@@ -87,4 +87,4 @@ gemnasium-dependency_scanning:
rules: *workflow_rules
bundler-audit-dependency_scanning:
- rules: *workflow_rules \ No newline at end of file
+ rules: *workflow_rules
diff --git a/Gemfile.lock b/Gemfile.lock
index eef6fa2..cddfc93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,4 +41,4 @@ DEPENDENCIES
rubocop (= 0.49.1)
BUNDLED WITH
- 1.17.2
+ 2.1.4