Skip to content

Commit b24b75a

Browse files
authored
Merge pull request #82 from DataDog/lloeki/bundler4
Move to bundler 4.0
2 parents dfb834e + 4b345e4 commit b24b75a

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/_build-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
-v "${PWD}":"${PWD}" -w "${PWD}" \
182182
-e BUNDLE_GEMFILE=gemfiles/${{ inputs.engine }}-${{ inputs.version }}.gemfile \
183183
${{ steps.vars.outputs.IMAGE }}:test \
184-
/bin/sh -c 'bundle install --with="test" --without="check ide" && bundle exec rake test'
184+
/bin/sh -c 'bundle config set without "check ide" && bundle config set with "test" && bundle install && bundle exec rake test'
185185
186186
join:
187187
needs: build

src/engines/ruby/4.0/Dockerfile.centos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ rm -r /usr/src/ruby
224224
if yum list installed ruby; then exit 1; fi
225225

226226
# update gem version
227-
gem update --system 3.7.2
227+
gem update --system 4.0.6
228228

229229
# rough smoke test
230230
ruby --version

src/engines/ruby/4.0/Dockerfile.gnu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ rm -r /usr/src/ruby
153153
if dpkg -l ruby 2>/dev/null | grep -q '^ii'; then exit 1; fi
154154

155155
# update gem version
156-
gem update --system 3.7.2
156+
gem update --system 4.0.6
157157

158158
# rough smoke test
159159
ruby --version

src/engines/ruby/4.0/Dockerfile.musl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN true "${REPRO_RUN_KEY}" && apk update
3131
ENV LANG en_US.UTF-8
3232

3333
## Install a pinned RubyGems and Bundler
34-
RUN gem update --system 3.7.2
34+
RUN gem update --system 4.0.6
3535

3636
# Install additional gems that are in CRuby but missing from the above
3737
# JRuby install distribution. These are version-pinned for reproducibility.

0 commit comments

Comments
 (0)