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 branch '3.x' into 'main' & prepare for 4.0.2 release #1378

Merged
merged 11 commits into from
Mar 25, 2024

Conversation

justinstoller
Copy link
Member

Conflicts:

  • lib/r10k/version.rb

Previously, if loading module metadata raised an uncaught exception
a user with automation that always used `--incremental` could not recover
from a failed deployment.

One specific case of this is a module without a proper implementation.
In that case a RuntimeError is raised. This adds RuntimeError to the
metadata loading rescue block.
Some issues that can be encountered when parsing Puppetfile metadata
raise R10K::Error. Catch R10K::Errors in metadata parsing.
Parsing metedata, for users who run `--incremental` with every deploy,
must not raise exceptions that end deployment. To prevent that we have
collected a large list of fairly basic execptions families.

This consolidates us to the ScriptError and StandardError exception
families, which contained all of the previous exceptions, but still
doesn't catch things like SystemExit exceptions.
…g_robustness

(PE-34196, PE-34917) Make loading metadata in `--incremental` deploys more robust
(maint) Use production forge for integration tests
Conflicts:
  - lib/r10k/version.rb
@justinstoller justinstoller requested review from a team as code owners March 25, 2024 17:15
@justinstoller justinstoller changed the title (maint) Merge branch '3.x' into 'main' (maint) Merge branch '3.x' into 'main' & prepare for 4.0.2 release Mar 25, 2024
@justinstoller
Copy link
Member Author

Figured I'd add an additional commit to prepare a release for these changes. Let me know if you'd like a separate PR.

@justinstoller justinstoller merged commit 04b594d into puppetlabs:main Mar 25, 2024
9 checks passed
@justinstoller justinstoller deleted the mergeup3 branch March 25, 2024 18:17
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.

2 participants