puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(maint) Update to 9.4.1.0-jdk8 and fix spec test.

Browse source
This commit is contained in:
isaac-hammes 2023-03-02 11:14:47 -08:00
parent 60fe266c9e
commit 1a75edcb60
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/testing.yml vendored
View file

@ -18,8 +18,7 @@ jobs:
strategy: strategy:
matrix: matrix:
ruby-version: ruby-version:
- 'jruby-9.3.6.0' - 'jruby-9.4.1.0'
- 'jruby-9.4.0.0'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Ruby - name: Set up Ruby
@ -35,8 +34,7 @@ jobs:
strategy: strategy:
matrix: matrix:
ruby-version: ruby-version:
- 'jruby-9.3.6.0' - 'jruby-9.4.1.0'
- 'jruby-9.4.0.0'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Ruby - name: Set up Ruby

2
lib/vmpooler.rb
View file

@ -34,7 +34,7 @@ module Vmpooler
config_string = ENV['VMPOOLER_CONFIG'] config_string = ENV['VMPOOLER_CONFIG']
# Parse the YAML config into a Hash # Parse the YAML config into a Hash
# Allow the Symbol class # Allow the Symbol class
parsed_config = YAML.safe_load(config_string, [Symbol]) parsed_config = YAML.safe_load(config_string, permitted_classes: [Symbol])
else else
# Take the name of the config file either from an ENV variable or from the filepath argument # Take the name of the config file either from an ENV variable or from the filepath argument
config_file = ENV['VMPOOLER_CONFIG_FILE'] || filepath config_file = ENV['VMPOOLER_CONFIG_FILE'] || filepath

2
update-gemfile-lock
View file

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