Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) Merge up 3.x into main #1396

Merged
merged 12 commits into from
Aug 5, 2024
Merged

Conversation

justinstoller
Copy link
Member

Conflicts:

  • CHANGELOG.mkd
  • integration/Gemfile
  • lib/r10k/version.rb

Please add all notable changes to the "Unreleased" section of the CHANGELOG in the format:

- (JIRA ticket) Summary of changes. [Issue or PR #](link to issue or PR)

bastelfreak and others added 12 commits April 9, 2024 20:14
This allows us to access the remote property to figure out the git URI
for a module:

```
$ bundle exec irb
Calling `DidYouMean::SPELL_CHECKERS.merge!(error_name => spell_checker)' has been deprecated. Please call `DidYouMean.correct_error(error_name, spell_checker)' instead.
irb(main):001:0> require 'json'
=> true
irb(main):002:0> require 'r10k/module_loader/puppetfile'
=> true
irb(main):003:0> puppetfile = R10K::ModuleLoader::Puppetfile.new(basedir: '/home/bastelfreak/code/controlrepo/').load
=>
{:modules=>
...
irb(main):004:0> mod = puppetfile[:modules].map {|mod| mod if mod.class == R10K::Module::Git}.compact.first
=>
...
irb(main):005:0> mod.remote
=> "https://github.com/voxpupuli/puppet-borg"
irb(main):006:0>
```

cherry-picked 22da06b from puppetlabs#1379
r10k::module::git: expose remote as getter
(maint) Allow automation to release 3.x versions as well
…prep

(maint) Prep for #patch release 3.16.2
This still doesn't update them to their most modern releases but does
as much of a lift as I have time for.
This still doesn't update them to their most modern releases but does
as much of a lift as I have time for.
…enhance

(maint) test updates - trust local repos & update dependencies
Conflicts:
 - CHANGELOG.mkd
 - integration/Gemfile
 - lib/r10k/version.rb
@justinstoller justinstoller requested review from a team as code owners August 5, 2024 19:42
@donoghuc donoghuc merged commit c8ec669 into puppetlabs:main Aug 5, 2024
9 checks passed
@justinstoller justinstoller deleted the mergeup3x branch August 5, 2024 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants