Merge main into releases/v4#3824
Merged
henrymercer merged 76 commits intoreleases/v4from Apr 15, 2026
Merged
Conversation
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.12 to 1.1.13. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v1.1.12...v1.1.13) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.13 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
We originally moved these to `ubuntu-slim`, but there is a significant performance difference. Since we often find ourselves waiting on these jobs, let's use the faster runners.
…pansion-1.1.13 Bump brace-expansion from 1.1.12 to 1.1.13
…ency Remove unused `@schemastore/package` dependency
Mergeback v4.35.1 refs/heads/releases/v4 into main
Move time-sensitive Actions workflows to `ubuntu-latest`
For the sake of consistency with the other pre-existing validation code.
…-no-submodules Overlay: Only require Git 2.36.0 for repos that contain submodules
The registry/language mapping table does not map the one with hyphens.
Generate and analyse esbuild bundle metadata
Store language aliases from linked CLI
Fix OIDC credential property names
Fix `pr-checks/tsconfig.json` for TS6
…hing Refactoring: Introduce `overlay/caching.ts`
Bumps the actions-minor group with 2 updates in the /.github/workflows directory: [ruby/setup-ruby](https://github.com/ruby/setup-ruby) and [actions/create-github-app-token](https://github.com/actions/create-github-app-token). Updates `ruby/setup-ruby` from 1.295.0 to 1.300.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](ruby/setup-ruby@319994f...4c56a21) Updates `actions/create-github-app-token` from 3.0.0 to 3.1.1 - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](actions/create-github-app-token@v3.0.0...v3.1.1) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.300.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor - dependency-name: actions/create-github-app-token dependency-version: 3.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the npm-minor group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@octokit/plugin-retry](https://github.com/octokit/plugin-retry.js) | `8.0.3` | `8.1.0` | | [jsonschema](https://github.com/tdegrunt/jsonschema) | `1.4.1` | `1.5.0` | | [@eslint/compat](https://github.com/eslint/rewrite/tree/HEAD/packages/compat) | `2.0.3` | `2.0.4` | | [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon) | `21.0.0` | `21.0.1` | | [esbuild](https://github.com/evanw/esbuild) | `0.27.4` | `0.28.0` | | [nock](https://github.com/nock/nock) | `14.0.11` | `14.0.12` | Updates `@octokit/plugin-retry` from 8.0.3 to 8.1.0 - [Release notes](https://github.com/octokit/plugin-retry.js/releases) - [Commits](octokit/plugin-retry.js@v8.0.3...v8.1.0) Updates `jsonschema` from 1.4.1 to 1.5.0 - [Commits](https://github.com/tdegrunt/jsonschema/commits) Updates `@eslint/compat` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/eslint/rewrite/releases) - [Changelog](https://github.com/eslint/rewrite/blob/main/packages/compat/CHANGELOG.md) - [Commits](https://github.com/eslint/rewrite/commits/compat-v2.0.4/packages/compat) Updates `@types/sinon` from 21.0.0 to 21.0.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon) Updates `esbuild` from 0.27.4 to 0.28.0 - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](evanw/esbuild@v0.27.4...v0.28.0) Updates `nock` from 14.0.11 to 14.0.12 - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](nock/nock@v14.0.11...v14.0.12) --- updated-dependencies: - dependency-name: "@octokit/plugin-retry" dependency-version: 8.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: jsonschema dependency-version: 1.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: "@eslint/compat" dependency-version: 2.0.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: "@types/sinon" dependency-version: 21.0.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor - dependency-name: esbuild dependency-version: 0.28.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor - dependency-name: nock dependency-version: 14.0.12 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…r-345b938e93 Bump the npm-minor group across 1 directory with 6 updates
…thub/workflows/actions-minor-cc17fecf2b Bump the actions-minor group across 1 directory with 2 updates
Update default bundle to 2.25.2
henrymercer
approved these changes
Apr 15, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This release-branch merge brings main changes into releases/v4 and bumps the action to the 4.35.2 release, including the corresponding changelog entry and dependency/tooling updates.
Changes:
- Bump action version to 4.35.2 and update
CHANGELOG.mdfor the release. - Update default CodeQL bundle to 2.25.2 and apply assorted feature/refactor/test updates included in the merge.
- Refresh dependencies, build tooling, and PR checks/workflows.
Show a summary per file
| File | Description |
|---|---|
| tsconfig.json | Updates TS compiler settings for TS6 and bundler-style module resolution. |
| src/trap-caching.ts | Adds deprecation warning for TRAP cache cleanup. |
| src/tools-features.ts | Removes a tools feature flag entry related to Python stdlib extraction. |
| src/testing-utils.ts | Updates overlay mode import path after overlay refactor. |
| src/status-report.ts | Updates overlay caching stats import after refactor. |
| src/start-proxy/types.ts | Fixes OIDC credential JSON property names to hyphenated keys. |
| src/start-proxy/types.test.ts | Updates tests to use hyphenated OIDC credential keys. |
| src/start-proxy.ts | Switches language alias handling to a checked-in aliases JSON snapshot. |
| src/start-proxy.test.ts | Adds/updates tests for multi-registry credentials and OIDC keys. |
| src/overlay/overlay-database-mode.ts | Extracts OverlayDatabaseMode enum into its own module. |
| src/overlay/index.ts | Refactors overlay module by moving caching logic out to overlay/caching.ts. |
| src/overlay/index.test.ts | Updates tests to align with overlay caching refactor. |
| src/overlay/caching.ts | New module containing overlay-base database cache upload/download logic. |
| src/overlay/caching.test.ts | New test suite for overlay caching module and stable cache keys. |
| src/known-language-aliases.json | Adds a checked-in snapshot of CodeQL language aliases. |
| src/init-action.ts | Updates overlay imports; adjusts Swift incompatible OS handling; removes Python stdlib override feature logic. |
| src/init-action-post-helper.ts | Updates overlay mode import path after refactor. |
| src/init-action-post-helper.test.ts | Updates overlay mode import path in tests. |
| src/git-utils.ts | Lowers Git requirement logic by only using --recurse-submodules when submodules exist. |
| src/git-utils.test.ts | Updates/extends tests for submodule-aware git ls-files behavior. |
| src/feature-flags.ts | Removes Python stdlib extraction feature flag configuration. |
| src/defaults.json | Bumps default CodeQL bundle/CLI versions to 2.25.2. |
| src/database-upload.ts | Updates overlay mode import path after refactor. |
| src/config-utils.ts | Adjusts overlay Git version validation to apply stricter requirement only when submodules exist. |
| src/config-utils.test.ts | Updates overlay enablement tests for new submodule-aware Git version logic. |
| src/codeql.ts | Updates overlay mode import path after refactor. |
| src/cli-errors.ts | Adds Swift incompatible OS configuration error category. |
| src/cli-errors.test.ts | Adds test coverage for Swift incompatible OS error wrapping. |
| src/analyze.ts | Updates overlay mode import path after refactor. |
| src/analyze-action.ts | Imports overlay cache upload from new overlay/caching module. |
| pr-checks/tsconfig.json | Adjusts PR-checks TS config for TS6 compatibility. |
| pr-checks/sync-checks.ts | Refactors API client construction into a dedicated module. |
| pr-checks/config.ts | Adds constant for esbuild metafile path used by tooling. |
| pr-checks/checks/start-proxy.yml | Extends start-proxy PR check to validate multiple registries in outputs. |
| pr-checks/checks/rubocop-multi-language.yml | Updates ruby/setup-ruby action version pin. |
| pr-checks/checks/language-aliases.yml | Updates language alias check inputs/expectations (removes Swift). |
| pr-checks/bundle-metadata.ts | Adds script to print esbuild bundle sizes from metafile. |
| pr-checks/api-client.ts | New shared API client helper for PR-check scripts. |
| package.json | Bumps package version to 4.35.2; updates deps; extends build to print bundle metadata. |
| package-lock.json | Lockfile updates for version bump and dependency upgrades. |
| lib/upload-sarif-action-post.js | Generated distribution artifact update (not reviewed). |
| lib/start-proxy-action-post.js | Generated distribution artifact update (not reviewed). |
| lib/defaults.json | Generated distribution artifact update of defaults (not reviewed). |
| build.mjs | Enables esbuild metafile output and writes meta.json. |
| CHANGELOG.md | Adds 4.35.2 release notes entry. |
| .gitignore | Ignores generated meta.json build metadata file. |
| .github/workflows/update-release-branch.yml | Moves time-sensitive jobs to ubuntu-latest; bumps token action. |
| .github/workflows/update-bundle.yml | Moves to ubuntu-latest; adds step to update checked-in language aliases snapshot. |
| .github/workflows/rollback-release.yml | Bumps actions/create-github-app-token version. |
| .github/workflows/prepare-release.yml | Moves to ubuntu-latest. |
| .github/workflows/post-release-mergeback.yml | Moves to ubuntu-latest; bumps token action. |
| .github/workflows/debug-artifacts-failure-safe.yml | Specifies languages for debug artifacts workflow init step. |
| .github/workflows/__start-proxy.yml | Generated workflow update (not reviewed). |
| .github/workflows/__rubocop-multi-language.yml | Generated workflow update (not reviewed). |
| .github/workflows/__language-aliases.yml | Generated workflow update (not reviewed). |
| .github/dependabot.yml | Extends Dependabot npm updates to also cover /pr-checks. |
Copilot's findings
- Files reviewed: 47/66 changed files
- Comments generated: 1
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 d2e135a into
releases/v4.Conductor for this PR is @henrymercer.
Contains the following pull requests:
@schemastore/packagedependency #3779 (@henrymercer)ubuntu-latest#3786 (@henrymercer)pr-checks/tsconfig.jsonfor TS6 #3810 (@mbg)overlay/caching.ts#3819 (@henrymercer)Please do the following:
releases/v4branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.