diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 86955f67..eac55b38 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,8 +18,7 @@ jobs: strategy: matrix: ruby-version: - - 'jruby-9.3.6.0' - - 'jruby-9.4.0.0' + - 'jruby-9.4.1.0' steps: - uses: actions/checkout@v3 - name: Set up Ruby @@ -35,8 +34,7 @@ jobs: strategy: matrix: ruby-version: - - 'jruby-9.3.6.0' - - 'jruby-9.4.0.0' + - 'jruby-9.4.1.0' steps: - uses: actions/checkout@v3 - name: Set up Ruby diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index 1bf8e039..516843f4 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -34,7 +34,7 @@ def self.config(filepath = 'vmpooler.yaml') config_string = ENV['VMPOOLER_CONFIG'] # Parse the YAML config into a Hash # Allow the Symbol class - parsed_config = YAML.safe_load(config_string, [Symbol]) + parsed_config = YAML.safe_load(config_string, permitted_classes: [Symbol]) else # Take the name of the config file either from an ENV variable or from the filepath argument config_file = ENV['VMPOOLER_CONFIG_FILE'] || filepath diff --git a/update-gemfile-lock b/update-gemfile-lock index 74e9c788..86952718 100755 --- a/update-gemfile-lock +++ b/update-gemfile-lock @@ -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.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=$?"'