diff --git a/package-lock.json b/package-lock.json index 5e165d2..6a16a10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "fs-extra": "^11.1.1", - "glob": "^10.4.1" + "glob": "^10.4.5" }, "devDependencies": { "@types/chai": "^4.3.5", @@ -4237,22 +4237,20 @@ } }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -7938,6 +7936,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" + }, "node_modules/package-json/node_modules/got": { "version": "12.6.1", "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", @@ -14376,14 +14379,15 @@ } }, "glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "requires": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "dependencies": { @@ -17146,6 +17150,11 @@ } } }, + "package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" + }, "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", diff --git a/package.json b/package.json index 3887b78..02457e5 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,6 @@ }, "dependencies": { "fs-extra": "^11.1.1", - "glob": "^10.4.1" + "glob": "^10.4.5" } } diff --git a/src/actions/checkSolution.ts b/src/actions/checkSolution.ts index 9b12d31..10583a7 100644 --- a/src/actions/checkSolution.ts +++ b/src/actions/checkSolution.ts @@ -8,6 +8,7 @@ import createPacRunner from "../pac/createPacRunner"; import { authenticateAdmin, authenticateEnvironment, clearAuthentication } from "../pac/auth/authenticate"; import { RunnerParameters } from "../Parameters"; import { AuthCredentials } from "../pac/auth/authParameters"; +import * as fs from "fs"; import { promises, rmdirSync, rmSync, writeFile } from "fs-extra"; export interface CheckSolutionParameters extends CommonActionParameters { @@ -107,8 +108,8 @@ export async function checkSolution(parameters: CheckSolutionParameters, runnerP const pacResult = await pac(...pacArgs); logger.log("CheckSolution Action Result: " + pacResult); - const files = glob.sync('**/*', { cwd: outputDirectory, absolute: true }); - const artifactStoreName = validator.getInput(parameters.artifactStoreName) || 'CheckSolutionLogs'; + const files: string[] = glob.sync('**/*', { cwd: outputDirectory, absolute: true }).filter((file: string) => !fs.lstatSync(file).isDirectory()); + const artifactStoreName = validator.getInput(parameters.artifactStoreName) || 'CodeAnalysisLogs'; await artifactStore.upload(artifactStoreName, files); const status = isolateStatus(pacResult);