Merge pull request #604 from puppetlabs/bump-jruby

Bump jruby to 9.4.3.0 and bundle update
This commit is contained in:
Jake Spain 2023-08-10 09:12:29 -04:00 committed by GitHub
commit 2f11f3155a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 23 deletions

View file

@ -70,10 +70,10 @@ jobs:
prerelease: false
# This step should closely match what is used in `docker/Dockerfile` in vmpooler-deployment
- name: Install Ruby jruby-9.4.2.0
- name: Install Ruby jruby-9.4.3.0
uses: ruby/setup-ruby@v1
with:
ruby-version: 'jruby-9.4.2.0'
ruby-version: 'jruby-9.4.3.0'
- name: Build gem
run: gem build *.gemspec

View file

@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
ruby-version:
- 'jruby-9.4.2.0'
- 'jruby-9.4.3.0'
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
@ -34,7 +34,7 @@ jobs:
strategy:
matrix:
ruby-version:
- 'jruby-9.4.2.0'
- 'jruby-9.4.3.0'
steps:
- uses: actions/checkout@v3
- name: Set up Ruby

View file

@ -36,7 +36,7 @@ GEM
deep_merge (1.2.2)
diff-lcs (1.5.0)
docile (1.4.0)
faraday (2.7.4)
faraday (2.7.10)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
@ -47,15 +47,14 @@ GEM
json (2.6.3-java)
language_server-protocol (3.17.0.3)
method_source (1.0.0)
mock_redis (0.36.0)
ruby2_keywords
mock_redis (0.37.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
net-ldap (0.18.0)
nio4r (2.5.9)
nio4r (2.5.9-java)
opentelemetry-api (1.1.0)
opentelemetry-common (0.19.6)
opentelemetry-api (1.2.1)
opentelemetry-common (0.19.7)
opentelemetry-api (~> 1.0)
opentelemetry-exporter-jaeger (0.22.0)
opentelemetry-api (~> 1.1)
@ -80,17 +79,17 @@ GEM
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.19.0)
opentelemetry-registry (0.2.0)
opentelemetry-registry (0.3.0)
opentelemetry-api (~> 1.1)
opentelemetry-resource_detectors (0.23.0)
google-cloud-env
opentelemetry-sdk (~> 1.0)
opentelemetry-sdk (1.2.0)
opentelemetry-sdk (1.2.1)
opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.19.3)
opentelemetry-registry (~> 0.2)
opentelemetry-semantic_conventions
opentelemetry-semantic_conventions (1.8.0)
opentelemetry-semantic_conventions (1.10.0)
opentelemetry-api (~> 1.0)
parallel (1.23.0)
parser (3.2.2.3)
@ -112,8 +111,8 @@ GEM
racc (1.7.1)
racc (1.7.1-java)
rack (2.2.8)
rack-protection (3.0.6)
rack
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rainbow (3.1.1)
@ -125,15 +124,15 @@ GEM
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rspec-support (3.12.1)
rubocop (1.55.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
@ -155,10 +154,10 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sinatra (3.0.6)
sinatra (3.1.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.6)
rack-protection (= 3.1.0)
tilt (~> 2.0)
spicy-proton (2.1.15)
bindata (~> 2.3)
@ -167,7 +166,7 @@ GEM
statsd-ruby (1.5.0)
thor (1.2.2)
thrift (0.18.1)
tilt (2.1.0)
tilt (2.2.0)
unicode-display_width (2.4.2)
yarjuf (2.0.0)
builder

View file

@ -5,7 +5,7 @@
# Update Gemfile.lock
docker run -it --rm \
-v $(pwd):/app \
jruby:9.4.2.0-jdk11 \
jruby:9.4.3.0-jdk11 \
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
# Update Changelog

View file

@ -3,5 +3,5 @@
# The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment
docker run -it --rm \
-v $(pwd):/app \
jruby:9.4.2.0-jdk11 \
jruby:9.4.3.0-jdk11 \
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'