Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v3 into releases/v2 #2166

Merged
merged 23 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1c652cd
Update default bundle to codeql-bundle-v2.16.3
github-actions[bot] Feb 20, 2024
5a96876
Add changelog note
github-actions[bot] Feb 20, 2024
9467b48
Update changelog and version after v3.24.4
github-actions[bot] Feb 22, 2024
2a15560
Merge branch 'main' into update-bundle/codeql-bundle-v2.16.3
smowton Feb 22, 2024
88189dc
Merge pull request #2156 from github/update-bundle/codeql-bundle-v2.16.3
smowton Feb 22, 2024
c9f3eed
Update checked-in dependencies
github-actions[bot] Feb 22, 2024
9bce06d
Merge branch 'main' into mergeback/v3.24.4-to-main-e2e140ad
nickfyson Feb 22, 2024
908a883
Merge pull request #2158 from github/mergeback/v3.24.4-to-main-e2e140ad
nickfyson Feb 22, 2024
5d55901
Use Go 1.22 in workflows
mbg Jan 3, 2024
e3a86ed
Add comment justifying why we set `cache: false`
mbg Feb 22, 2024
2896599
Merge pull request #2060 from github/mbg/go/1.22
mbg Feb 22, 2024
aeb89ef
Enable C++ deptrace when using autobuild build mode
henrymercer Feb 22, 2024
a74dcdb
Merge pull request #2160 from github/henrymercer/deptrace-with-build-…
henrymercer Feb 22, 2024
28c2900
Update changelog for v3.24.5
github-actions[bot] Feb 23, 2024
47b3d88
Merge pull request #2162 from github/update-v3.24.5-a74dcdb05
smowton Feb 23, 2024
ed2c332
correct the changelog for 3.24.5
nickfyson Feb 23, 2024
633baf8
Merge pull request #2165 from github/nickfyson/fix-3.24.5-changelog
nickfyson Feb 23, 2024
d15fdd8
Revert "Update version and changelog for v2.24.4"
github-actions[bot] Feb 23, 2024
7351df0
Revert "Update checked-in dependencies"
github-actions[bot] Feb 23, 2024
557a8d2
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24…
github-actions[bot] Feb 23, 2024
8c3591c
Update version and changelog for v2.24.5
github-actions[bot] Feb 23, 2024
fa5685c
fix the mergeback changelog
nickfyson Feb 23, 2024
0505382
Update checked-in dependencies
github-actions[bot] Feb 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/__go-tracing-autobuilder.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .github/workflows/__go-tracing-custom-build-steps.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .github/workflows/__go-tracing-legacy-workflow.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

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.

## 2.24.5 - 23 Feb 2024

- Update default CodeQL bundle version to 2.16.3. [#2156](https://github.com/github/codeql-action/pull/2156)

## 2.24.4 - 21 Feb 2024

- 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)
Expand Down
5 changes: 5 additions & 0 deletions lib/analyze.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/analyze.js.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion lib/autobuild.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/autobuild.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions lib/defaults.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.16.2",
"cliVersion": "2.16.2",
"priorBundleVersion": "codeql-bundle-v2.16.1",
"priorCliVersion": "2.16.1"
"bundleVersion": "codeql-bundle-v2.16.3",
"cliVersion": "2.16.3",
"priorBundleVersion": "codeql-bundle-v2.16.2",
"priorCliVersion": "2.16.2"
}
2 changes: 1 addition & 1 deletion node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codeql",
"version": "2.24.4",
"version": "2.24.5",
"private": true,
"description": "CodeQL action",
"scripts": {
Expand Down
5 changes: 4 additions & 1 deletion pr-checks/checks/go-tracing-autobuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ env:
steps:
- uses: actions/setup-go@v5
with:
go-version: "~1.21.1"
go-version: "~1.22.0"
# to avoid potentially misleading autobuilder results where we expect it to download
# dependencies successfully, but they actually come from a warm cache
cache: false
- uses: ./../action/init
with:
languages: go
Expand Down
5 changes: 4 additions & 1 deletion pr-checks/checks/go-tracing-custom-build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ operatingSystems: ["ubuntu", "macos"]
steps:
- uses: actions/setup-go@v5
with:
go-version: "~1.21.1"
go-version: "~1.22.0"
# to avoid potentially misleading autobuilder results where we expect it to download
# dependencies successfully, but they actually come from a warm cache
cache: false
- uses: ./../action/init
with:
languages: go
Expand Down
5 changes: 4 additions & 1 deletion pr-checks/checks/go-tracing-legacy-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ env:
steps:
- uses: actions/setup-go@v5
with:
go-version: "~1.21.1"
go-version: "~1.22.0"
# to avoid potentially misleading autobuilder results where we expect it to download
# dependencies successfully, but they actually come from a warm cache
cache: false
- uses: ./../action/init
with:
languages: go
Expand Down
7 changes: 7 additions & 0 deletions src/analyze.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { safeWhich } from "@chrisgavin/safe-which";
import del from "del";
import * as yaml from "js-yaml";

import { setupCppAutobuild } from "./autobuild";
import {
CODEQL_VERSION_ANALYSIS_SUMMARY_V2,
CodeQL,
Expand Down Expand Up @@ -191,6 +192,12 @@ export async function runExtraction(
config.buildMode &&
(await codeql.supportsFeature(ToolsFeature.TraceCommandUseBuildMode))
) {
if (
language === Language.cpp &&
config.buildMode === BuildMode.Autobuild
) {
await setupCppAutobuild(codeql, logger);
}
await codeql.extractUsingBuildMode(config, language);
} else {
await codeql.extractScannedLanguage(config, language);
Expand Down
2 changes: 1 addition & 1 deletion src/autobuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export async function determineAutobuildLanguages(
return languages;
}

async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
const envVar = featureConfig[Feature.CppDependencyInstallation].envVar;
const featureName = "C++ automatic installation of dependencies";
const envDoc =
Expand Down
8 changes: 4 additions & 4 deletions src/defaults.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.16.2",
"cliVersion": "2.16.2",
"priorBundleVersion": "codeql-bundle-v2.16.1",
"priorCliVersion": "2.16.1"
"bundleVersion": "codeql-bundle-v2.16.3",
"cliVersion": "2.16.3",
"priorBundleVersion": "codeql-bundle-v2.16.2",
"priorCliVersion": "2.16.2"
}