Skip to content

Commit

Permalink
(maint) Merge branch '3.x' into 'main'
Browse files Browse the repository at this point in the history
Conflicts:
 - CHANGELOG.mkd
 - integration/Gemfile
 - lib/r10k/version.rb
  • Loading branch information
justinstoller committed Aug 5, 2024
2 parents 0a79e08 + 99505c6 commit 17d48ea
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- 3.x
paths:
- 'lib/r10k/version.rb'

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ Unreleased
- (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.2
------

- r10k::module::git: expose remote as getter [#1379](https://github.com/puppetlabs/r10k/pull/1379)

3.16.1
------
Expand Down
4 changes: 2 additions & 2 deletions integration/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ end

gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.40')
gem 'beaker-pe', '~> 3.0'
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.0')
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.2')
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.1')
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.4')
gem 'rototiller', '= 1.0'
gem 'beaker-qa-i18n'

0 comments on commit 17d48ea

Please sign in to comment.