Skip to content

Commit fc92642

Browse files
committed
Merge remote-tracking branch 'origin/main' into henrymercer/run-unit-tests-on-windows
2 parents 130a51d + ea8fb21 commit fc92642

7 files changed

Lines changed: 17 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [UNRELEASED]
44

5+
No user facing changes.
6+
7+
## 2.1.15 - 28 Jun 2022
8+
59
- CodeQL query packs listed in the `packs` configuration field will be skipped if their target language is not being analyzed in the current Actions job. Previously, this would throw an error. [#1116](https://github.com/github/codeql-action/pull/1116)
610
- The combination of python2 and poetry is no longer supported. See https://github.com/actions/setup-python/issues/374 for more details. [#1124](https://github.com/github/codeql-action/pull/1124)
711
- Update default CodeQL bundle version to 2.10.0. [#1123](https://github.com/github/codeql-action/pull/1123)

lib/init.js

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

lib/init.js.map

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

node_modules/.package-lock.json

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "2.1.15",
3+
"version": "2.1.16",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

src/init.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,14 @@ export async function installPythonDeps(codeql: CodeQL, logger: Logger) {
249249
if (process.platform === "win32") {
250250
await new toolrunner.ToolRunner(await safeWhich.safeWhich("py"), [
251251
"-3",
252+
"-B",
252253
path.join(scriptsFolder, script),
253254
path.dirname(codeql.getPath()),
254255
]).exec();
255256
} else {
256-
await new toolrunner.ToolRunner(path.join(scriptsFolder, script), [
257+
await new toolrunner.ToolRunner(await safeWhich.safeWhich("python3"), [
258+
"-B",
259+
path.join(scriptsFolder, script),
257260
path.dirname(codeql.getPath()),
258261
]).exec();
259262
}

0 commit comments

Comments
 (0)