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

Commits on Apr 9, 2024

  1. r10k::module::git: expose remote as getter

    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
    bastelfreak committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    df8a068 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge pull request puppetlabs#1380 from bastelfreak/remote

    r10k::module::git: expose remote as getter
    justinstoller authored May 9, 2024
    Configuration menu
    Copy the full SHA
    88d4d78 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Configuration menu
    Copy the full SHA
    8aae06d View commit details
    Browse the repository at this point in the history
  2. Merge pull request puppetlabs#1389 from justinstoller/release-3.x

    (maint) Allow automation to release 3.x versions as well
    justinstoller authored May 10, 2024
    Configuration menu
    Copy the full SHA
    c155b41 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Configuration menu
    Copy the full SHA
    289b871 View commit details
    Browse the repository at this point in the history
  2. Merge pull request puppetlabs#1390 from justinstoller/3.16.2-release-…

    …prep
    
    (maint) Prep for #patch release 3.16.2
    justinstoller authored May 21, 2024
    Configuration menu
    Copy the full SHA
    eb69bf7 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. (maint) Update test deps to relatively recent releases

    This still doesn't update them to their most modern releases but does
    as much of a lift as I have time for.
    justinstoller committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    e014e0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a79e08 View commit details
    Browse the repository at this point in the history
  3. (maint) Update test deps to relatively recent releases

    This still doesn't update them to their most modern releases but does
    as much of a lift as I have time for.
    justinstoller committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    b0d4af5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3268f82 View commit details
    Browse the repository at this point in the history
  5. Merge pull request puppetlabs#1395 from justinstoller/maint-security-…

    …enhance
    
    (maint) test updates - trust local repos & update dependencies
    justinstoller authored Jul 31, 2024
    Configuration menu
    Copy the full SHA
    99505c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. (maint) Merge branch '3.x' into 'main'

    Conflicts:
     - CHANGELOG.mkd
     - integration/Gemfile
     - lib/r10k/version.rb
    justinstoller committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    17d48ea View commit details
    Browse the repository at this point in the history