Skip to content

Commit 5d1c69e

Browse files
authored
chore: use bundler 2.x with ruby 2.7 (#84)
this seems to be a known issue: https://gitlab.com/gitlab-org/gitlab/-/issues/337510
1 parent 1019bc3 commit 5d1c69e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
export COMPOSE_IGNORE_ORPHANS ?= true
33
export RUBY_VERSION ?= 2.3.1
44
RUBY_VERSION_MAJOR = $(word 1,$(subst ., ,$(RUBY_VERSION)))
5+
RUBY_VERSION_MINOR = $(word 2,$(subst ., ,$(RUBY_VERSION)))
56
export BUNDLER_VERSION ?=
67
ifeq ($(BUNDLER_VERSION),)
78
ifeq ($(RUBY_VERSION_MAJOR),2)
9+
# Use old bundler for Ruby 2.3-2.6; Ruby 2.7 needs bundler 2.x to avoid resolver bugs
10+
ifeq ($(RUBY_VERSION_MINOR),7)
11+
export BUNDLER_VERSION = 2.4.22
12+
else
813
export BUNDLER_VERSION = 1.17.3
914
endif
1015
endif
16+
endif
1117
PROJECT_NAME = $(shell ls *.gemspec | sed 's/\.gemspec//')
1218
export COMPOSE_PROJECT_NAME ?= $(PROJECT_NAME)-$(subst .,_,$(RUBY_VERSION))
1319

0 commit comments

Comments
 (0)