From f1f6323e434c82ca33388093c78acc1617ba8143 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Thu, 11 May 2023 21:31:54 -0400 Subject: [PATCH 1/2] Add Gemfile.lock as recommended by bundler --- .gitignore | 1 - Gemfile.lock | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index d3deae5b..462d9a81 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ log/* junit acceptance-tests pkg -Gemfile.lock options.rb test.cfg .yardoc diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..c328b285 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,215 @@ +PATH + remote: . + specs: + beaker-pe (2.12.0) + beaker (>= 4.0, < 6) + beaker-abs + beaker-answers (~> 0.0) + beaker-puppet (>= 1, < 3) + beaker-vmpooler (~> 1.0) + stringify-hash (~> 0.0.0) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.0.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + ansi (1.5.0) + ast (2.4.2) + bcrypt_pbkdf (1.1.0) + beaker (4.40.1) + beaker-hostgenerator + ed25519 (~> 1.0) + hocon (~> 1.0) + in-parallel (>= 0.1, < 2) + inifile (~> 3.0) + minitar (~> 0.6) + minitest (~> 5.4) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 5.0) + rexml + rsync (~> 1.0.9) + stringify-hash (~> 0.0) + thor (>= 1.0.1, < 2.0) + beaker-abs (0.11.0) + bcrypt_pbkdf (>= 1.0, < 2.0) + beaker (~> 4.0) + ed25519 (>= 1.2, < 2.0) + vmfloaty (>= 1.0, < 2) + beaker-answers (0.29.0) + hocon (~> 1.0) + require_all (>= 1.3.2, < 3.1.0) + stringify-hash (~> 0.0.0) + beaker-hostgenerator (2.2.0) + deep_merge (~> 1.0) + beaker-puppet (2.0.0) + beaker (~> 4.1) + oga (~> 3.4) + beaker-vmpooler (1.4.0) + stringify-hash (~> 0.0.0) + coderay (1.1.3) + commander (4.6.0) + highline (~> 2.0.0) + concurrent-ruby (1.2.2) + daemons (1.4.1) + deep_merge (1.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + ed25519 (1.3.0) + eventmachine (1.2.7) + fakefs (2.4.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + highline (2.0.3) + hocon (1.4.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + i18n (1.13.0) + concurrent-ruby (~> 1.0) + in-parallel (1.0.0) + inifile (3.0.0) + iniparser (1.0.1) + json (2.6.3) + kramdown (2.4.0) + rexml + logutils (0.6.1) + markdown (1.2.0) + kramdown (>= 1.5.0) + props (>= 1.1.2) + textutils (>= 0.10.0) + method_source (1.0.0) + minitar (0.9) + minitest (5.18.0) + multipart-post (2.3.0) + net-ldap (0.16.3) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.1.0) + oga (3.4) + ast + ruby-ll (~> 2.1) + power_assert (2.0.3) + props (1.2.0) + iniparser (>= 0.1.0) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + rack (2.2.7) + rake (13.0.6) + require_all (3.0.0) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rsync (1.0.9) + ruby-ll (2.1.2) + ansi + ast + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + scooter (4.4.0) + beaker (~> 4.0) + faraday (~> 1.5) + faraday-cookie_jar (~> 0.0, >= 0.0.7) + faraday_middleware (~> 1.2) + json (>= 2.3.0) + net-ldap (~> 0.16.0) + test-unit + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + stringify-hash (0.0.2) + test-unit (3.5.7) + power_assert + textutils (1.4.0) + activesupport + logutils (>= 0.6.1) + props (>= 1.1.2) + rubyzip (>= 1.0.0) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (1.2.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + vmfloaty (1.8.0) + commander (>= 4.4.3, < 4.7.0) + faraday (~> 1.5, >= 1.5.1) + yard (0.9.34) + +PLATFORMS + aarch64-linux + ruby + x86_64-linux + +DEPENDENCIES + activesupport (~> 7.0) + beaker (~> 4.0) + beaker-abs (~> 0.8) + beaker-pe! + beaker-vmpooler (~> 1.3) + deep_merge + fakefs (~> 2.4, < 2.5.0) + markdown + pry (~> 0.10) + rake (~> 13.0.6) + rspec (~> 3.0) + rspec-its + scooter (~> 4.3) + simplecov (= 0.22.0) + thin + yard + +BUNDLED WITH + 2.4.13 From c8bd225940f8101a1cdf2a7a898565dc16848761 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Thu, 11 May 2023 21:32:48 -0400 Subject: [PATCH 2/2] 2.12.0 release prep --- CHANGELOG.md | 19 +++++++++++++++++++ lib/beaker-pe/version.rb | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c67f00b4..abc9d77c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [2.12.0](https://github.com/puppetlabs/beaker-pe/tree/2.12.0) (2023-05-12) + +[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.11.24...2.12.0) + +**Implemented enhancements:** + +- \(RE-15478\) Update actions and release workflow [\#217](https://github.com/puppetlabs/beaker-pe/pull/217) ([yachub](https://github.com/yachub)) +- \(RE-15111\) Add Mend Scanning [\#211](https://github.com/puppetlabs/beaker-pe/pull/211) ([yachub](https://github.com/yachub)) +- \(RE-14819\) Retry failed curls before trying to gunzip them [\#203](https://github.com/puppetlabs/beaker-pe/pull/203) ([e-gris](https://github.com/e-gris)) + +**Merged pull requests:** + +- Update beaker-puppet requirement from ~\> 1.0 to \>= 1, \< 3 [\#218](https://github.com/puppetlabs/beaker-pe/pull/218) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Allow beaker 5 [\#215](https://github.com/puppetlabs/beaker-pe/pull/215) ([bastelfreak](https://github.com/bastelfreak)) +- Update fakefs requirement from ~\> 0.6, \< 0.14.0 to ~\> 2.4, \< 2.5.0 [\#214](https://github.com/puppetlabs/beaker-pe/pull/214) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Update simplecov requirement from = 0.18.5 to = 0.22.0 [\#209](https://github.com/puppetlabs/beaker-pe/pull/209) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Update activesupport requirement from ~\> 5.0 to ~\> 7.0 [\#192](https://github.com/puppetlabs/beaker-pe/pull/192) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Update rake requirement from ~\> 12.3.3 to ~\> 13.0.6 [\#185](https://github.com/puppetlabs/beaker-pe/pull/185) ([dependabot[bot]](https://github.com/apps/dependabot)) + ## [2.11.24](https://github.com/puppetlabs/beaker-pe/tree/2.11.24) (2022-11-01) [Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.11.23...2.11.24) diff --git a/lib/beaker-pe/version.rb b/lib/beaker-pe/version.rb index 4c396b02..b2d90ea5 100644 --- a/lib/beaker-pe/version.rb +++ b/lib/beaker-pe/version.rb @@ -3,7 +3,7 @@ module DSL module PE module Version - STRING = '2.11.24' + STRING = '2.12.0' end end