From 5829820d068712242f07062867e100e1597d3518 Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Tue, 18 Jun 2019 15:58:03 +0800 Subject: [PATCH 1/2] (maint) Update very old Beaker version in Gemfile Currently beaker is pinned at version 2.x which causes issues on Windows with modern Ruby. Beaker 2.x pulls in VERY old versions of nokogiri which cannot be compiled on Windows. This commit updates the Beaker version pin to version 3.x as this has been out for over a year, and will allow developers on Windows to at least do a bundle install. Later commits may update this to the latest beaker version (4.x) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fd9de43f7..e018fc5c5 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do end group :acceptance do - gem 'beaker', '~> 3.0' + gem 'beaker', '~> 3.37' gem 'beaker-rspec' gem 'beaker-hostgenerator' gem 'beaker-abs' From da1bfe2e0ab27e231cdbf62e8da0228d4503f0f8 Mon Sep 17 00:00:00 2001 From: Jesse Scott Date: Wed, 19 Jun 2019 11:09:55 -0700 Subject: [PATCH 2/2] (MAINT) Bump travis puppet4 cell to Ruby 2.1.9 The README specifies a minimum Ruby version of 2.1.9, and we only relaxed the gemspec requirement to 2.1.0 in PDOC-259 to support some puppet_agent module testing. Skipping 2.1.0 for testing allows us to bump our dev-only dependency on Beaker to a reasonably modern range. Since there is no runtime dependency on Beaker, this shouldn't break downstream users on Ruby 2.1.0. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1b7ce30c..ee6285bfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: matrix: fast_finish: true include: - - rvm: 2.1.0 + - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 4" CHECK=spec - rvm: 2.4.1 env: PUPPET_GEM_VERSION="~> 4" CHECK=spec