Merge releases/v4 into releases/v3 #3430
Merged
Conversation
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
Mergeback v4.31.11 refs/heads/releases/v4 into main
Add `installYq` option to `sync.py` and install `yq` directly from GitHub release
Update default bundle to 2.24.0
This deals with the case that we skip `x.y.0` and go straight to `x.y.1`.
…eries Bump the Action minor version number on new CodeQL minor version series
Merge main into releases/v4
This reverts commit 9ffacc7.
This reverts commit c9e0329.
henrymercer
added
Rebuild
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
Jan 26, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request merges changes from releases/v4 into releases/v3 to backport recent improvements to the v3 release branch. The changes include updating the default CodeQL bundle to version 2.24.0, improving the yq installation process on Windows, and bumping the Action version to 3.32.0.
Changes:
- Updated default CodeQL bundle from 2.23.9 to 2.24.0
- Improved yq installation on Windows by downloading directly from GitHub releases instead of using chocolatey
- Bumped Action version to 3.32.0 (minor version bump for new CodeQL minor version series)
- Added automated logic to bump Action minor version when CodeQL minor version changes
Reviewed changes
Copilot reviewed 20 out of 21 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| CHANGELOG.md | Added entry for version 3.32.0 documenting the CodeQL bundle update |
| package.json | Bumped version from 3.31.11 to 3.32.0 |
| package-lock.json | Updated version to match package.json (should be 3.32.0) |
| src/defaults.json | Updated CodeQL bundle and CLI versions to 2.24.0 |
| lib/defaults.json | Mirror of src/defaults.json changes (generated) |
| pr-checks/sync.py | Added installYq option to download yq directly from GitHub releases |
| pr-checks/checks/build-mode-autobuild.yml | Replaced choco install with new installYq flag |
| .github/workflows/update-bundle.yml | Added logic to bump Action minor version on new CodeQL minor version series |
| .github/workflows/__build-mode-autobuild.yml | Generated workflow file reflecting yq installation changes |
| lib/*.js | Generated JavaScript files with updated version numbers and bundle versions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 b20883b into
releases/v3.Conductor for this PR is @henrymercer.
Contains the following pull requests:
installYqoption tosync.pyand installyqdirectly from GitHub release #3423 (@mbg)Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.