Skip to content

Commit 5b815f2

Browse files
authored
Merge branch 'main' into henrymercer/sha256
2 parents b43bb7b + 67f4038 commit 5b815f2

15 files changed

Lines changed: 213 additions & 201 deletions

.github/workflows/__multi-language-autodetect.yml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__swift-autobuild.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
strategy:
7878
fail-fast: false
7979
matrix:
80-
os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14,macos-15]
80+
os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14-xlarge,macos-15-xlarge]
8181
tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
8282
runs-on: ${{ matrix.os }}
8383

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
55
## [UNRELEASED]
66

77
- Add support for SHA-256 Git object IDs. [#3893](https://github.com/github/codeql-action/pull/3893)
8+
9+
## 4.35.5 - 15 May 2026
10+
11+
- We have improved how the JavaScript bundles for the CodeQL Action are generated to avoid duplication across bundles and reduce the size of the repository by around 70%. This should have no effect on the runtime behaviour of the CodeQL Action. [#3899](https://github.com/github/codeql-action/pull/3899)
812
- For performance and accuracy reasons, [improved incremental analysis](https://github.com/github/roadmap/issues/1158) will now only be enabled on a pull request when diff-informed analysis is also enabled for that run. If diff-informed analysis is unavailable (for example, because the PR diff ranges could not be computed), the action will fall back to a full analysis. [#3791](https://github.com/github/codeql-action/pull/3791)
913
- If multiple inputs are provided for the GitHub-internal `analysis-kinds` input, only `code-scanning` will be enabled. The `analysis-kinds` input is experimental, for GitHub-internal use only, and may change without notice at any time. [#3892](https://github.com/github/codeql-action/pull/3892)
1014
- Added an experimental change which, when running a Code Scanning analysis for a PR with [improved incremental analysis](https://github.com/github/roadmap/issues/1158) enabled, prefers CodeQL CLI versions that have a cached overlay-base database for the configured languages. This speeds up analysis for a repository when there is not yet a cached overlay-base database for the latest CLI version. We expect to roll this change out to everyone in May. [#3880](https://github.com/github/codeql-action/pull/3880)

build.mjs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ const onEndPlugin = {
6666
const SHARED_ENTRYPOINT = "entry-points";
6767

6868
/**
69-
* This plugin finds all source files that contain action entry points.
70-
* It then generates the virtual `entry-points` module which imports all identifies files,
69+
* This plugin finds all source files that contain Action entry points.
70+
* It then generates the virtual `entry-points` module which imports all identified files,
7171
* and re-exports their `runWrapper` functions with suitable aliases.
7272
* A tiny stub file is emitted for each Action entrypoint. Each stub imports the shared bundle
7373
* and calls the respective entry point.
@@ -83,7 +83,7 @@ const entryPointsPlugin = {
8383
const toPascal = (s) =>
8484
s.replace(/(^|-)([a-z0-9])/gi, (_, __, c) => c.toUpperCase());
8585

86-
// Find the source files containing action entry points.
86+
// Find the source files containing Action entry points.
8787
build.onStart(() => {
8888
const actionFiles = globSync("src/*-action{,-post}.ts");
8989
for (const actionFile of actionFiles) {
@@ -112,7 +112,7 @@ const entryPointsPlugin = {
112112
return { path: SHARED_ENTRYPOINT, namespace };
113113
});
114114

115-
// Generate the virtual `entry-points` file based on the actions we discovered.
115+
// Generate the virtual `entry-points` file based on the Actions we discovered.
116116
// Restrict using the namespace. The path filter does not need to discriminate any further.
117117
build.onLoad({ filter: /.*/, namespace }, async () => {
118118
const wrapperTemplatePath = "entry-wrapper.js.tpl";
@@ -127,7 +127,7 @@ const entryPointsPlugin = {
127127
const imports = actionsSorted
128128
.map(
129129
(action) =>
130-
`import * as ${action.pascalCaseName} from "./src/${basename(action.path)}"`,
130+
`import * as ${action.pascalCaseName} from "./src/${basename(action.path)}";`,
131131
)
132132
.join("\n");
133133
const wrappers = actionsSorted
@@ -143,7 +143,7 @@ const entryPointsPlugin = {
143143
};
144144
});
145145

146-
// Emit entry point stubs for each action using the entry template.
146+
// Emit entry point stubs for each Action using the entry template.
147147
build.onEnd(async (result) => {
148148
// Read the entry point template.
149149
const templatePath = "action-entry.js.tpl";
@@ -152,7 +152,7 @@ const entryPointsPlugin = {
152152
const makeHeader = (sourceFile) =>
153153
`// Automatically generated from '${templatePath}' for 'src/${basename(sourceFile)}'.\n\n`;
154154

155-
// Write entry point stubs for each action.
155+
// Write entry point stubs for each Action.
156156
for (const action of actions) {
157157
await writeFile(
158158
join(

lib/entry-points.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/upload-lib.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "4.35.5",
3+
"version": "4.35.6",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {
@@ -12,7 +12,8 @@
1212
"ava": "npm run transpile && ava --verbose",
1313
"test": "npm run ava -- src/",
1414
"test-debug": "npm run test -- --timeout=20m",
15-
"transpile": "tsc --build --verbose tsconfig.json"
15+
"transpile": "tsc --build --verbose tsconfig.json",
16+
"update-pr-checks": "./pr-checks/sync.sh"
1617
},
1718
"license": "MIT",
1819
"workspaces": [

pr-checks/checks/multi-language-autodetect.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: "Multi-language repository"
22
description: "An end-to-end integration test of a multi-language repository using automatic language detection"
33
operatingSystems:
44
- ubuntu
5-
- macos
5+
- os: macos
6+
runner-image: macos-latest-xlarge
67
env:
78
CODEQL_ACTION_RESOLVE_SUPPORTED_LANGUAGES_USING_CLI: true
89
installGo: true

0 commit comments

Comments
 (0)