From f216fe874659419118fd0fc0fe88a064000875a6 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Wed, 26 Jul 2023 14:55:22 -0700 Subject: [PATCH 1/3] (maint) Update PR testing Test on both main & 3.x instead of 4.x, test all supported versions of Ruby on Linux, test JRuby 9.3 & 9.4 (support 2.6 & 3.1 compat resp), and run oldest and newest versions of Ruby on Windows. Also update windows to use latest release rather than 2019. --- .github/workflows/rspec_tests.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rspec_tests.yml b/.github/workflows/rspec_tests.yml index afadcd241..5dd281e52 100644 --- a/.github/workflows/rspec_tests.yml +++ b/.github/workflows/rspec_tests.yml @@ -3,7 +3,8 @@ name: Rspec tests on: pull_request: branches: - - 4.x + - main + - 3.x jobs: rspec_tests: @@ -16,8 +17,9 @@ jobs: - {os: ubuntu-latest, ruby: 3.1} - {os: ubuntu-latest, ruby: 3.2} - {os: ubuntu-latest, ruby: jruby-9.3} - - {os: windows-2019, ruby: 2.6} - - {os: windows-2019, ruby: 2.7} + - {os: ubuntu-latest, ruby: jruby-9.4} + - {os: windows-latest, ruby: 2.6} + - {os: windows-latest, ruby: 3.2} runs-on: ${{ matrix.cfg.os }} steps: From 43ea2f4bda0f8c71759329c883e516654189ead0 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Wed, 26 Jul 2023 15:32:14 -0700 Subject: [PATCH 2/3] (maint) Fix merge up of CHANGLELOG/prep for 4.0.0 release --- CHANGELOG.mkd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd index 3ff630955..174e5b74a 100644 --- a/CHANGELOG.mkd +++ b/CHANGELOG.mkd @@ -3,9 +3,17 @@ CHANGELOG Unreleased ---------- -- Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337) -- Drop Ruby 2.3/2.4/2.5 support; puppet_forge: Use 4.1 and newer [#1336](https://github.com/puppetlabs/r10k/pull/1336) + +4.0.0 +----- +- Drop Ruby 2.3/2.4/2.5 support; use puppet_forge 4.1 or newer [#1336](https://github.com/puppetlabs/r10k/pull/1336) +- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261) +- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277) +- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275) +- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261) +- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254) +- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235) 3.16.0 @@ -33,14 +41,6 @@ Unreleased - Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298) - Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316) -- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277) -- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275) -- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261) -- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261) -- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254) -- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235) -- Drop EoL Ruby 2.3/2.4 support [#1280](https://github.com/puppetlabs/r10k/pull/1208) - 3.15.0 ------ From 2bfa5c607d82e066518732516075ab560e672a02 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Mon, 31 Jul 2023 16:00:55 -0700 Subject: [PATCH 3/3] (maint) Update r10k version for #major 4.0.0 release --- lib/r10k/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/r10k/version.rb b/lib/r10k/version.rb index 756eb3fba..f9bcd0663 100644 --- a/lib/r10k/version.rb +++ b/lib/r10k/version.rb @@ -2,5 +2,5 @@ module R10K # When updating to a new major (X) or minor (Y) version, include `#major` or # `#minor` (respectively) in your commit message to trigger the appropriate # release. Otherwise, a new patch (Z) version will be released. - VERSION = '4.0.0.pre' + VERSION = '4.0.0' end