Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps/ruby 3 3 6 #137

Merged
merged 2 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.3
3.3.6
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ ADD docker/gemrc /root/.gemrc
ADD docker/pact /usr/local/bin/pact

RUN apk update \
&& apk add ruby=3.3.3-r1 \
ruby-io-console=3.3.3-r1 \
&& apk add ruby=3.3.6-r0 \
ruby-io-console=3.3.6-r0 \
ca-certificates=20240705-r0 \
libressl \
less \
git \
&& apk add --virtual "build-dependencies" \
build-base=0.5-r3 \
ruby-dev=3.3.3-r1 \
ruby-dev=3.3.6-r0 \
libressl-dev \
ruby-rdoc=3.3.3-r1 \
ruby-rdoc=3.3.6-r0 \
&& gem install bundler -v "~>2.5" \
&& bundler -v \
&& bundle config build.nokogiri --use-system-libraries \
&& bundle config git.allow_insecure true \
&& gem update --system 3.5.20 \
&& gem install json -v "~>2.3" \
&& gem update --system 3.5.23 \
&& gem install json -v "~>2.7.6" \
&& gem install bigdecimal -v "~>3.1" \
&& gem install racc -v "~>1.8" \
&& gem uninstall rubygems-update \
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile-bundle-base
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apk update \
ruby-rdoc \
&& bundle config build.nokogiri --use-system-libraries \
&& bundle config git.allow_insecure true \
&& gem update --system 3.5.20 \
&& gem update --system 3.5.23 \
&& gem install json \
&& gem install bigdecimal \
&& gem install racc \
Expand All @@ -32,4 +32,6 @@ WORKDIR $HOME

ADD pact-cli.gemspec Gemfile Gemfile.lock $HOME/
ADD lib/pact/cli/version.rb $HOME/lib/pact/cli/version.rb
RUN bundle install --without test development
RUN bundle config set without 'test development' \
bundle config set deployment 'true' \
&& bundle install
6 changes: 4 additions & 2 deletions Dockerfile-node
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN apk update \
&& bundle config build.nokogiri --use-system-libraries \
&& bundle config git.allow_insecure true \
&& gem update --system 3.5.20 \
&& gem install json -v "~>2.3" \
&& gem install json -v "~>2.7.6" \
&& gem install bigdecimal -v "~>3.1" \
&& gem install racc -v "~>1.8" \
&& gem uninstall rubygems-update \
Expand All @@ -52,7 +52,9 @@ ADD pact-cli.gemspec .
ADD Gemfile .
ADD Gemfile.lock .
ADD lib/pact/cli/version.rb ./lib/pact/cli/version.rb
RUN bundle install --without test development --deployment true \
RUN bundle config set without 'test development' \
bundle config set deployment 'true' \
&& bundle install \
&& find /usr/lib/ruby/gems/3.3.0/gems -name Gemfile.lock -maxdepth 2 -delete
ADD docker/entrypoint.sh $HOME/entrypoint.sh
ADD bin ./bin
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PATH
specs:
pact-cli (1.3.0)
bigdecimal (~> 3.1)
json (~> 2.3)
json (~> 2.7)
pact-mock_service
pact-provider-verifier
pact_broker-client (~> 1.28)
Expand Down Expand Up @@ -42,7 +42,7 @@ GEM
csv
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
json (2.7.3)
json (2.7.6)
logger (1.6.1)
method_source (1.1.0)
mini_mime (1.1.5)
Expand Down Expand Up @@ -147,4 +147,4 @@ DEPENDENCIES
rspec (~> 3.0)

BUNDLED WITH
2.5.14
2.5.23
2 changes: 1 addition & 1 deletion pact-cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "pact-mock_service"
spec.add_dependency "pact-provider-verifier"
spec.add_dependency "pact_broker-client", "~> 1.28"
spec.add_dependency "json", "~>2.3" # must match native lib install in the Dockerfile
spec.add_dependency "json", "~>2.7" # must match native lib install in the Dockerfile
spec.add_dependency "bigdecimal", "~>3.1" # must match native lib install in the Dockerfile

# Locking this until we have given rack-test 3.0 a good shake out in pure Ruby
Expand Down