From 50cd353998617af79c99ff2b1692926638a6563c Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Mon, 7 Nov 2022 11:04:16 -0800 Subject: [PATCH] Set `CODEQL_EXTRACTOR_GO_BUILD_TRACING` on again --- lib/languages.js | 31 ++++++++++++++++++++++++++++++- lib/languages.js.map | 2 +- src/languages.ts | 14 +++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/lib/languages.js b/lib/languages.js index 08c95c8ec..54e68552b 100644 --- a/lib/languages.js +++ b/lib/languages.js @@ -1,6 +1,26 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.isScannedLanguage = exports.isTracedLanguage = exports.parseLanguage = exports.Language = void 0; +const core = __importStar(require("@actions/core")); // All the languages supported by CodeQL var Language; (function (Language) { @@ -39,7 +59,16 @@ function isTracedLanguage(language, logger) { if ("CODEQL_EXTRACTOR_GO_BUILD_TRACING" in process.env) { logger.warning("Go build tracing is now enabled by default, so the CODEQL_EXTRACTOR_GO_BUILD_TRACING environment variable which was previously used to manually enable Go build tracing is now deprecated. We recommend that you remove this environment variable from your workflow."); } - return ["cpp", "csharp", "go", "java", "swift"].includes(language); + if (language === Language.go) { + core.exportVariable("CODEQL_EXTRACTOR_GO_BUILD_TRACING", "on"); + } + return [ + Language.cpp, + Language.csharp, + Language.go, + Language.java, + Language.swift, + ].includes(language); } exports.isTracedLanguage = isTracedLanguage; function isScannedLanguage(language, logger) { diff --git a/lib/languages.js.map b/lib/languages.js.map index 2741a5d41..c0041461f 100644 --- a/lib/languages.js.map +++ b/lib/languages.js.map @@ -1 +1 @@ -{"version":3,"file":"languages.js","sourceRoot":"","sources":["../src/languages.ts"],"names":[],"mappings":";;;AAEA,wCAAwC;AACxC,IAAY,QASX;AATD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,qBAAS,CAAA;IACT,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,yBAAa,CAAA;IACb,2BAAe,CAAA;AACjB,CAAC,EATW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QASnB;AAED,iCAAiC;AACjC,MAAM,gBAAgB,GAAiC;IACrD,CAAC,EAAE,QAAQ,CAAC,GAAG;IACf,KAAK,EAAE,QAAQ,CAAC,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;CAChC,CAAC;AAEF,gGAAgG;AAChG,SAAgB,aAAa,CAAC,QAAgB;IAC5C,0BAA0B;IAC1B,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAElC,6BAA6B;IAC7B,IAAI,QAAQ,IAAI,QAAQ,EAAE;QACxB,OAAO,QAAoB,CAAC;KAC7B;IAED,yBAAyB;IACzB,IAAI,QAAQ,IAAI,gBAAgB,EAAE;QAChC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACnC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,sCAeC;AAED,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,MAAc;IACjE,IAAI,mCAAmC,IAAI,OAAO,CAAC,GAAG,EAAE;QACtD,MAAM,CAAC,OAAO,CACZ,uQAAuQ,CACxQ,CAAC;KACH;IAED,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACrE,CAAC;AARD,4CAQC;AAED,SAAgB,iBAAiB,CAAC,QAAkB,EAAE,MAAc;IAClE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC;AAFD,8CAEC"} \ No newline at end of file +{"version":3,"file":"languages.js","sourceRoot":"","sources":["../src/languages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAItC,wCAAwC;AACxC,IAAY,QASX;AATD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,qBAAS,CAAA;IACT,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,yBAAa,CAAA;IACb,2BAAe,CAAA;AACjB,CAAC,EATW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QASnB;AAED,iCAAiC;AACjC,MAAM,gBAAgB,GAAiC;IACrD,CAAC,EAAE,QAAQ,CAAC,GAAG;IACf,KAAK,EAAE,QAAQ,CAAC,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;CAChC,CAAC;AAEF,gGAAgG;AAChG,SAAgB,aAAa,CAAC,QAAgB;IAC5C,0BAA0B;IAC1B,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAElC,6BAA6B;IAC7B,IAAI,QAAQ,IAAI,QAAQ,EAAE;QACxB,OAAO,QAAoB,CAAC;KAC7B;IAED,yBAAyB;IACzB,IAAI,QAAQ,IAAI,gBAAgB,EAAE;QAChC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACnC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,sCAeC;AAED,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,MAAc;IACjE,IAAI,mCAAmC,IAAI,OAAO,CAAC,GAAG,EAAE;QACtD,MAAM,CAAC,OAAO,CACZ,uQAAuQ,CACxQ,CAAC;KACH;IAED,IAAI,QAAQ,KAAK,QAAQ,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,cAAc,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAAC;KAChE;IAED,OAAO;QACL,QAAQ,CAAC,GAAG;QACZ,QAAQ,CAAC,MAAM;QACf,QAAQ,CAAC,EAAE;QACX,QAAQ,CAAC,IAAI;QACb,QAAQ,CAAC,KAAK;KACf,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACvB,CAAC;AAlBD,4CAkBC;AAED,SAAgB,iBAAiB,CAAC,QAAkB,EAAE,MAAc;IAClE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC;AAFD,8CAEC"} \ No newline at end of file diff --git a/src/languages.ts b/src/languages.ts index f582a0b00..e0872bce4 100644 --- a/src/languages.ts +++ b/src/languages.ts @@ -1,3 +1,5 @@ +import * as core from "@actions/core"; + import { Logger } from "./logging"; // All the languages supported by CodeQL @@ -45,7 +47,17 @@ export function isTracedLanguage(language: Language, logger: Logger): boolean { ); } - return ["cpp", "csharp", "go", "java", "swift"].includes(language); + if (language === Language.go) { + core.exportVariable("CODEQL_EXTRACTOR_GO_BUILD_TRACING", "on"); + } + + return [ + Language.cpp, + Language.csharp, + Language.go, + Language.java, + Language.swift, + ].includes(language); } export function isScannedLanguage(language: Language, logger: Logger): boolean {