Merge releases/v4 into releases/v3#3784
Merged
henrymercer merged 16 commits intoreleases/v3from Mar 27, 2026
Merged
Conversation
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.3 to 1.4.0. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.3...v1.4.0) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.4.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Mergeback v4.35.0 refs/heads/releases/v4 into main
…ge-1.4.0 Bump node-forge from 1.3.3 to 1.4.0
…ersion Update minimum Git version for overlay to 2.36.0
Merge main into releases/v4
This reverts commit 124f6ee.
This reverts commit b1a5f00.
Contributor
Author
|
Pushed a commit to rebuild the Action. Please mark the PR as ready for review to trigger PR checks. |
henrymercer
approved these changes
Mar 27, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges release-branch changes from releases/v4 into releases/v3, producing a v3 patch release that updates dependencies and corrects overlay-related Git version requirements.
Changes:
- Bump action version to
3.35.1and update the changelog entry for the patch release. - Update the minimum Git version required for overlay/improved incremental analysis to
2.36.0. - Bump
node-forgeto^1.4.0and regenerate distribution files inlib/.
Reviewed changes
Copilot reviewed 15 out of 16 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/git-utils.ts | Updates overlay minimum Git version constant and related inline documentation/comments. |
| package.json | Bumps action version to 3.35.1 and updates node-forge dependency to ^1.4.0. |
| package-lock.json | Updates lockfile to reflect dependency/version changes (but version metadata currently mismatches package.json). |
| CHANGELOG.md | Adds 3.35.1 release notes describing the Git minimum version correction. |
| lib/upload-sarif-action.js | Regenerated distribution output reflecting the new action version. |
| lib/upload-sarif-action-post.js | Regenerated distribution output reflecting the new action version. |
| lib/upload-lib.js | Regenerated distribution output reflecting the new action version. |
| lib/start-proxy-action.js | Regenerated distribution output (includes updated bundled node-forge). |
| lib/start-proxy-action-post.js | Regenerated distribution output reflecting the new action version. |
| lib/setup-codeql-action.js | Regenerated distribution output reflecting the new action version. |
| lib/resolve-environment-action.js | Regenerated distribution output reflecting the new action version. |
| lib/init-action.js | Regenerated distribution output reflecting the new action version and updated Git minimum constant. |
| lib/init-action-post.js | Regenerated distribution output reflecting the new action version. |
| lib/autobuild-action.js | Regenerated distribution output reflecting the new action version. |
| lib/analyze-action.js | Regenerated distribution output reflecting the new action version. |
| lib/analyze-action-post.js | Regenerated distribution output reflecting the new action version. |
Comment on lines
+264
to
+265
| // We use --stage rather than --format here because --stage has been available since Git 2.36.0, | ||
| // while --format was only introduced in Git 2.38.0. |
There was a problem hiding this comment.
This comment is inaccurate: --stage itself predates Git 2.36.0; the 2.36.0 requirement is about the compatibility of git ls-files --recurse-submodules with --stage (and needing OIDs in the output). Please reword this to reflect the actual constraint so future readers don’t infer that --stage was introduced in 2.36.0.
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
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.
Merging c10b806 into
releases/v3.Conductor for this PR is @henrymercer.
Contains the following pull requests:
Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.