Skip to content

Commit a56a03b

Browse files
authoredFeb 23, 2024
Merge pull request #2166 from github/backport-v2.24.5-633baf86c
Merge releases/v3 into releases/v2
2 parents 80eb8d5 + 0505382 commit a56a03b

18 files changed

+57
-22
lines changed
 

‎.github/workflows/__go-tracing-autobuilder.yml

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__go-tracing-custom-build-steps.yml

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__go-tracing-legacy-workflow.yml

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
44

55
Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.
66

7+
## 2.24.5 - 23 Feb 2024
8+
9+
- Update default CodeQL bundle version to 2.16.3. [#2156](https://github.com/github/codeql-action/pull/2156)
10+
711
## 2.24.4 - 21 Feb 2024
812

913
- Fix an issue where an existing, but empty, `/sys/fs/cgroup/cpuset.cpus` file always resulted in a single-threaded run. [#2151](https://github.com/github/codeql-action/pull/2151)

‎lib/analyze.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/analyze.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/autobuild.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/autobuild.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.16.2",
3-
"cliVersion": "2.16.2",
4-
"priorBundleVersion": "codeql-bundle-v2.16.1",
5-
"priorCliVersion": "2.16.1"
2+
"bundleVersion": "codeql-bundle-v2.16.3",
3+
"cliVersion": "2.16.3",
4+
"priorBundleVersion": "codeql-bundle-v2.16.2",
5+
"priorCliVersion": "2.16.2"
66
}

‎node_modules/.package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "2.24.4",
3+
"version": "2.24.5",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

‎pr-checks/checks/go-tracing-autobuilder.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ env:
66
steps:
77
- uses: actions/setup-go@v5
88
with:
9-
go-version: "~1.21.1"
9+
go-version: "~1.22.0"
10+
# to avoid potentially misleading autobuilder results where we expect it to download
11+
# dependencies successfully, but they actually come from a warm cache
12+
cache: false
1013
- uses: ./../action/init
1114
with:
1215
languages: go

‎pr-checks/checks/go-tracing-custom-build-steps.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ operatingSystems: ["ubuntu", "macos"]
44
steps:
55
- uses: actions/setup-go@v5
66
with:
7-
go-version: "~1.21.1"
7+
go-version: "~1.22.0"
8+
# to avoid potentially misleading autobuilder results where we expect it to download
9+
# dependencies successfully, but they actually come from a warm cache
10+
cache: false
811
- uses: ./../action/init
912
with:
1013
languages: go

‎pr-checks/checks/go-tracing-legacy-workflow.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ env:
66
steps:
77
- uses: actions/setup-go@v5
88
with:
9-
go-version: "~1.21.1"
9+
go-version: "~1.22.0"
10+
# to avoid potentially misleading autobuilder results where we expect it to download
11+
# dependencies successfully, but they actually come from a warm cache
12+
cache: false
1013
- uses: ./../action/init
1114
with:
1215
languages: go

‎src/analyze.ts

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { safeWhich } from "@chrisgavin/safe-which";
77
import del from "del";
88
import * as yaml from "js-yaml";
99

10+
import { setupCppAutobuild } from "./autobuild";
1011
import {
1112
CODEQL_VERSION_ANALYSIS_SUMMARY_V2,
1213
CodeQL,
@@ -191,6 +192,12 @@ export async function runExtraction(
191192
config.buildMode &&
192193
(await codeql.supportsFeature(ToolsFeature.TraceCommandUseBuildMode))
193194
) {
195+
if (
196+
language === Language.cpp &&
197+
config.buildMode === BuildMode.Autobuild
198+
) {
199+
await setupCppAutobuild(codeql, logger);
200+
}
194201
await codeql.extractUsingBuildMode(config, language);
195202
} else {
196203
await codeql.extractScannedLanguage(config, language);

‎src/autobuild.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export async function determineAutobuildLanguages(
111111
return languages;
112112
}
113113

114-
async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
114+
export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
115115
const envVar = featureConfig[Feature.CppDependencyInstallation].envVar;
116116
const featureName = "C++ automatic installation of dependencies";
117117
const envDoc =

‎src/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.16.2",
3-
"cliVersion": "2.16.2",
4-
"priorBundleVersion": "codeql-bundle-v2.16.1",
5-
"priorCliVersion": "2.16.1"
2+
"bundleVersion": "codeql-bundle-v2.16.3",
3+
"cliVersion": "2.16.3",
4+
"priorBundleVersion": "codeql-bundle-v2.16.2",
5+
"priorCliVersion": "2.16.2"
66
}

0 commit comments

Comments
 (0)