Merge branch 'main' into update-bundle/codeql-bundle-v2.21.2
This commit is contained in:
Nick Rolfe
GitHub
commit
9aba20e4c9
7 changed files with 98 additions and 80 deletions
|
|
@ -3,6 +3,9 @@
|
||||||
name: Code-Scanning config CLI tests
|
name: Code-Scanning config CLI tests
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
# Diff informed queries add an additional query filter which is not yet
|
||||||
|
# taken into account by these tests.
|
||||||
|
CODEQL_ACTION_DIFF_INFORMED_QUERIES: false
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|
|
||||||
7
lib/analyze.js
generated
7
lib/analyze.js
generated
|
|
@ -343,7 +343,12 @@ function writeDiffRangeDataExtensionPack(logger, ranges) {
|
||||||
ranges = [{ path: "", startLine: 0, endLine: 0 }];
|
ranges = [{ path: "", startLine: 0, endLine: 0 }];
|
||||||
}
|
}
|
||||||
const diffRangeDir = path.join(actionsUtil.getTemporaryDirectory(), "pr-diff-range");
|
const diffRangeDir = path.join(actionsUtil.getTemporaryDirectory(), "pr-diff-range");
|
||||||
fs.mkdirSync(diffRangeDir);
|
// We expect the Actions temporary directory to already exist, so are mainly
|
||||||
|
// using `recursive: true` to avoid errors if the directory already exists,
|
||||||
|
// for example if the analyze Action is run multiple times in the same job.
|
||||||
|
// This is not really something that is supported, but we make use of it in
|
||||||
|
// tests.
|
||||||
|
fs.mkdirSync(diffRangeDir, { recursive: true });
|
||||||
fs.writeFileSync(path.join(diffRangeDir, "qlpack.yml"), `
|
fs.writeFileSync(path.join(diffRangeDir, "qlpack.yml"), `
|
||||||
name: codeql-action/pr-diff-range
|
name: codeql-action/pr-diff-range
|
||||||
version: 0.0.0
|
version: 0.0.0
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
78
lib/dependency-caching.js
generated
78
lib/dependency-caching.js
generated
|
|
@ -57,42 +57,44 @@ function getJavaTempDependencyDir() {
|
||||||
/**
|
/**
|
||||||
* Default caching configurations per language.
|
* Default caching configurations per language.
|
||||||
*/
|
*/
|
||||||
const CODEQL_DEFAULT_CACHE_CONFIG = {
|
function getDefaultCacheConfig() {
|
||||||
java: {
|
return {
|
||||||
paths: [
|
java: {
|
||||||
// Maven
|
paths: [
|
||||||
(0, path_1.join)(os.homedir(), ".m2", "repository"),
|
// Maven
|
||||||
// Gradle
|
(0, path_1.join)(os.homedir(), ".m2", "repository"),
|
||||||
(0, path_1.join)(os.homedir(), ".gradle", "caches"),
|
// Gradle
|
||||||
// CodeQL Java build-mode: none
|
(0, path_1.join)(os.homedir(), ".gradle", "caches"),
|
||||||
getJavaTempDependencyDir(),
|
// CodeQL Java build-mode: none
|
||||||
],
|
getJavaTempDependencyDir(),
|
||||||
hash: [
|
],
|
||||||
// Maven
|
hash: [
|
||||||
"**/pom.xml",
|
// Maven
|
||||||
// Gradle
|
"**/pom.xml",
|
||||||
"**/*.gradle*",
|
// Gradle
|
||||||
"**/gradle-wrapper.properties",
|
"**/*.gradle*",
|
||||||
"buildSrc/**/Versions.kt",
|
"**/gradle-wrapper.properties",
|
||||||
"buildSrc/**/Dependencies.kt",
|
"buildSrc/**/Versions.kt",
|
||||||
"gradle/*.versions.toml",
|
"buildSrc/**/Dependencies.kt",
|
||||||
"**/versions.properties",
|
"gradle/*.versions.toml",
|
||||||
],
|
"**/versions.properties",
|
||||||
},
|
],
|
||||||
csharp: {
|
},
|
||||||
paths: [(0, path_1.join)(os.homedir(), ".nuget", "packages")],
|
csharp: {
|
||||||
hash: [
|
paths: [(0, path_1.join)(os.homedir(), ".nuget", "packages")],
|
||||||
// NuGet
|
hash: [
|
||||||
"**/packages.lock.json",
|
// NuGet
|
||||||
// Paket
|
"**/packages.lock.json",
|
||||||
"**/paket.lock",
|
// Paket
|
||||||
],
|
"**/paket.lock",
|
||||||
},
|
],
|
||||||
go: {
|
},
|
||||||
paths: [(0, path_1.join)(os.homedir(), "go", "pkg", "mod")],
|
go: {
|
||||||
hash: ["**/go.sum"],
|
paths: [(0, path_1.join)(os.homedir(), "go", "pkg", "mod")],
|
||||||
},
|
hash: ["**/go.sum"],
|
||||||
};
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
async function makeGlobber(patterns) {
|
async function makeGlobber(patterns) {
|
||||||
return glob.create(patterns.join("\n"));
|
return glob.create(patterns.join("\n"));
|
||||||
}
|
}
|
||||||
|
|
@ -106,7 +108,7 @@ async function makeGlobber(patterns) {
|
||||||
async function downloadDependencyCaches(languages, logger) {
|
async function downloadDependencyCaches(languages, logger) {
|
||||||
const restoredCaches = [];
|
const restoredCaches = [];
|
||||||
for (const language of languages) {
|
for (const language of languages) {
|
||||||
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
|
const cacheConfig = getDefaultCacheConfig()[language];
|
||||||
if (cacheConfig === undefined) {
|
if (cacheConfig === undefined) {
|
||||||
logger.info(`Skipping download of dependency cache for ${language} as we have no caching configuration for it.`);
|
logger.info(`Skipping download of dependency cache for ${language} as we have no caching configuration for it.`);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -140,7 +142,7 @@ async function downloadDependencyCaches(languages, logger) {
|
||||||
*/
|
*/
|
||||||
async function uploadDependencyCaches(config, logger) {
|
async function uploadDependencyCaches(config, logger) {
|
||||||
for (const language of config.languages) {
|
for (const language of config.languages) {
|
||||||
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
|
const cacheConfig = getDefaultCacheConfig()[language];
|
||||||
if (cacheConfig === undefined) {
|
if (cacheConfig === undefined) {
|
||||||
logger.info(`Skipping upload of dependency cache for ${language} as we have no caching configuration for it.`);
|
logger.info(`Skipping upload of dependency cache for ${language} as we have no caching configuration for it.`);
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"version":3,"file":"dependency-caching.js","sourceRoot":"","sources":["../src/dependency-caching.ts"],"names":[],"mappings":"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"}
|
{"version":3,"file":"dependency-caching.js","sourceRoot":"","sources":["../src/dependency-caching.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoCA,4DAEC;AAuDD,4DAmDC;AAQD,wDAiEC;AAzND,uCAAyB;AACzB,+BAA4B;AAE5B,6DAA+C;AAC/C,oDAAsC;AAEtC,iDAAuD;AACvD,mDAAoD;AAEpD,+CAAuC;AAGvC,iCAA6C;AAgB7C,MAAM,8BAA8B,GAAG,qBAAqB,CAAC;AAC7D,MAAM,+BAA+B,GAAG,CAAC,CAAC;AAE1C;;;;GAIG;AACH,SAAgB,wBAAwB;IACtC,OAAO,IAAA,WAAI,EAAC,IAAA,oCAAqB,GAAE,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;AACpE,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB;IAC5B,OAAO;QACL,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,QAAQ;gBACR,IAAA,WAAI,EAAC,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC;gBACvC,SAAS;gBACT,IAAA,WAAI,EAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC;gBACvC,+BAA+B;gBAC/B,wBAAwB,EAAE;aAC3B;YACD,IAAI,EAAE;gBACJ,QAAQ;gBACR,YAAY;gBACZ,SAAS;gBACT,cAAc;gBACd,8BAA8B;gBAC9B,yBAAyB;gBACzB,6BAA6B;gBAC7B,wBAAwB;gBACxB,wBAAwB;aACzB;SACF;QACD,MAAM,EAAE;YACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;YACjD,IAAI,EAAE;gBACJ,QAAQ;gBACR,uBAAuB;gBACvB,QAAQ;gBACR,eAAe;aAChB;SACF;QACD,EAAE,EAAE;YACF,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/C,IAAI,EAAE,CAAC,WAAW,CAAC;SACpB;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,QAAkB;IAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,wBAAwB,CAC5C,SAAqB,EACrB,MAAc;IAEd,MAAM,cAAc,GAAe,EAAE,CAAC;IAEtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CACT,6CAA6C,QAAQ,8CAA8C,CACpG,CAAC;YACF,SAAS;QACX,CAAC;QAED,gGAAgG;QAChG,wBAAwB;QACxB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CACT,6CAA6C,QAAQ,mDAAmD,CACzG,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACzD,MAAM,WAAW,GAAa,CAAC,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE5D,MAAM,CAAC,IAAI,CACT,yBAAyB,QAAQ,aAAa,UAAU,qBAAqB,WAAW,CAAC,IAAI,CAC3F,IAAI,CACL,EAAE,CACJ,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,YAAY,CAC5C,WAAW,CAAC,KAAK,EACjB,UAAU,EACV,WAAW,CACZ,CAAC;QAEF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,oBAAoB,MAAM,QAAQ,QAAQ,GAAG,CAAC,CAAC;YAC3D,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,+BAA+B,QAAQ,GAAG,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB,CAAC,MAAc,EAAE,MAAc;IACzE,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CACT,2CAA2C,QAAQ,8CAA8C,CAClG,CAAC;YACF,SAAS;QACX,CAAC;QAED,gGAAgG;QAChG,wBAAwB;QACxB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CACT,2CAA2C,QAAQ,mDAAmD,CACvG,CAAC;YACF,SAAS;QACX,CAAC;QAED,yGAAyG;QACzG,uGAAuG;QACvG,uCAAuC;QACvC,uGAAuG;QACvG,uGAAuG;QACvG,sCAAsC;QACtC,uGAAuG;QACvG,sGAAsG;QACtG,sGAAsG;QACtG,4CAA4C;QAC5C,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAiB,EAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAEtE,iCAAiC;QACjC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CACT,2CAA2C,QAAQ,qBAAqB,CACzE,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAElD,MAAM,CAAC,IAAI,CACT,2BAA2B,IAAI,QAAQ,QAAQ,aAAa,GAAG,KAAK,CACrE,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,yFAAyF;YACzF,uFAAuF;YACvF,gCAAgC;YAChC,IAAI,KAAK,YAAY,YAAY,CAAC,iBAAiB,EAAE,CAAC;gBACpD,MAAM,CAAC,IAAI,CACT,2BAA2B,QAAQ,aAAa,GAAG,qBAAqB,CACzE,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,kCAAkC;gBAClC,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,QAAQ,CACrB,QAAkB,EAClB,WAAwB;IAExB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/D,OAAO,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC;AACjD,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,WAAW,CAAC,QAAkB;IAC3C,MAAM,QAAQ,GAAG,IAAA,0BAAmB,EAAC,WAAW,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAM,CAAC,yBAAyB,CAAC,CAAC;IACnE,IAAI,MAAM,GAAG,8BAA8B,CAAC;IAE5C,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,IAAI,YAAY,EAAE,CAAC;IACvC,CAAC;IAED,OAAO,GAAG,MAAM,IAAI,+BAA+B,IAAI,QAAQ,IAAI,QAAQ,GAAG,CAAC;AACjF,CAAC"}
|
||||||
|
|
@ -507,7 +507,13 @@ function writeDiffRangeDataExtensionPack(
|
||||||
actionsUtil.getTemporaryDirectory(),
|
actionsUtil.getTemporaryDirectory(),
|
||||||
"pr-diff-range",
|
"pr-diff-range",
|
||||||
);
|
);
|
||||||
fs.mkdirSync(diffRangeDir);
|
|
||||||
|
// We expect the Actions temporary directory to already exist, so are mainly
|
||||||
|
// using `recursive: true` to avoid errors if the directory already exists,
|
||||||
|
// for example if the analyze Action is run multiple times in the same job.
|
||||||
|
// This is not really something that is supported, but we make use of it in
|
||||||
|
// tests.
|
||||||
|
fs.mkdirSync(diffRangeDir, { recursive: true });
|
||||||
fs.writeFileSync(
|
fs.writeFileSync(
|
||||||
path.join(diffRangeDir, "qlpack.yml"),
|
path.join(diffRangeDir, "qlpack.yml"),
|
||||||
`
|
`
|
||||||
|
|
|
||||||
|
|
@ -41,42 +41,44 @@ export function getJavaTempDependencyDir(): string {
|
||||||
/**
|
/**
|
||||||
* Default caching configurations per language.
|
* Default caching configurations per language.
|
||||||
*/
|
*/
|
||||||
const CODEQL_DEFAULT_CACHE_CONFIG: { [language: string]: CacheConfig } = {
|
function getDefaultCacheConfig(): { [language: string]: CacheConfig } {
|
||||||
java: {
|
return {
|
||||||
paths: [
|
java: {
|
||||||
// Maven
|
paths: [
|
||||||
join(os.homedir(), ".m2", "repository"),
|
// Maven
|
||||||
// Gradle
|
join(os.homedir(), ".m2", "repository"),
|
||||||
join(os.homedir(), ".gradle", "caches"),
|
// Gradle
|
||||||
// CodeQL Java build-mode: none
|
join(os.homedir(), ".gradle", "caches"),
|
||||||
getJavaTempDependencyDir(),
|
// CodeQL Java build-mode: none
|
||||||
],
|
getJavaTempDependencyDir(),
|
||||||
hash: [
|
],
|
||||||
// Maven
|
hash: [
|
||||||
"**/pom.xml",
|
// Maven
|
||||||
// Gradle
|
"**/pom.xml",
|
||||||
"**/*.gradle*",
|
// Gradle
|
||||||
"**/gradle-wrapper.properties",
|
"**/*.gradle*",
|
||||||
"buildSrc/**/Versions.kt",
|
"**/gradle-wrapper.properties",
|
||||||
"buildSrc/**/Dependencies.kt",
|
"buildSrc/**/Versions.kt",
|
||||||
"gradle/*.versions.toml",
|
"buildSrc/**/Dependencies.kt",
|
||||||
"**/versions.properties",
|
"gradle/*.versions.toml",
|
||||||
],
|
"**/versions.properties",
|
||||||
},
|
],
|
||||||
csharp: {
|
},
|
||||||
paths: [join(os.homedir(), ".nuget", "packages")],
|
csharp: {
|
||||||
hash: [
|
paths: [join(os.homedir(), ".nuget", "packages")],
|
||||||
// NuGet
|
hash: [
|
||||||
"**/packages.lock.json",
|
// NuGet
|
||||||
// Paket
|
"**/packages.lock.json",
|
||||||
"**/paket.lock",
|
// Paket
|
||||||
],
|
"**/paket.lock",
|
||||||
},
|
],
|
||||||
go: {
|
},
|
||||||
paths: [join(os.homedir(), "go", "pkg", "mod")],
|
go: {
|
||||||
hash: ["**/go.sum"],
|
paths: [join(os.homedir(), "go", "pkg", "mod")],
|
||||||
},
|
hash: ["**/go.sum"],
|
||||||
};
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async function makeGlobber(patterns: string[]): Promise<glob.Globber> {
|
async function makeGlobber(patterns: string[]): Promise<glob.Globber> {
|
||||||
return glob.create(patterns.join("\n"));
|
return glob.create(patterns.join("\n"));
|
||||||
|
|
@ -96,7 +98,7 @@ export async function downloadDependencyCaches(
|
||||||
const restoredCaches: Language[] = [];
|
const restoredCaches: Language[] = [];
|
||||||
|
|
||||||
for (const language of languages) {
|
for (const language of languages) {
|
||||||
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
|
const cacheConfig = getDefaultCacheConfig()[language];
|
||||||
|
|
||||||
if (cacheConfig === undefined) {
|
if (cacheConfig === undefined) {
|
||||||
logger.info(
|
logger.info(
|
||||||
|
|
@ -150,7 +152,7 @@ export async function downloadDependencyCaches(
|
||||||
*/
|
*/
|
||||||
export async function uploadDependencyCaches(config: Config, logger: Logger) {
|
export async function uploadDependencyCaches(config: Config, logger: Logger) {
|
||||||
for (const language of config.languages) {
|
for (const language of config.languages) {
|
||||||
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
|
const cacheConfig = getDefaultCacheConfig()[language];
|
||||||
|
|
||||||
if (cacheConfig === undefined) {
|
if (cacheConfig === undefined) {
|
||||||
logger.info(
|
logger.info(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue