chore: merge master into 6.x - #604
Merged
Merged
Conversation
Brings the 6.x release branch up to date with master ahead of the next release. master has two commits since the last merge (#600): - feat: own the PEM parser and validate the encapsulated text (#603) - chore: send the Codecov upload token from CI The merge is clean. The merged tree is identical to master except for the release files 6.x keeps for itself: CHANGELOG.md, .grenrc.js, the 6.2.0 version, and the gren 5.1.1 devDependency from #601. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings the
6.xrelease branch up to date withmasterahead of the next release.What comes in
masterhas two commits since #600 merged it last:feat: own the PEM parser and validate the encapsulated textchore: send the Codecov upload token from CI#603 touches
src/index.tsandsrc/types.ts, so it was checked against the 6.x line. It is minor:toPem(),pemCertificates()andPemLabelare new, andderToPem()still works as a deprecated alias oftoPem(). The input it now rejects is input OpenSSL already refused, so the error now comes from the parser, with a clearer message. The one exception, a certificate with a second one run into its data, is covered in that PR's "Not breaking" section.Result
The merge had no conflicts. The merged tree is identical to
masterexcept for the release files6.xkeeps for itself:CHANGELOG.mdand.grenrc.js, from chore: regenerate the changelog with gren 5.1.1 #601 and the6.xreleasespackage.json/package-lock.json: version6.2.0and@cjbarth/github-release-notes^5.1.1The version is left at
6.2.0. The bump goes in its ownRelease X.Y.Zcommit after this merge, as in past releases.Verification
npm ci, then on the merged tree:npm run build: cleannpm test: 428 passingnpm run lint: clean🤖 Generated with Claude Code