github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-05-22 05:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3250 from github/henrymercer/prefer-fs-delete

Browse Source 
Use Node `fs` APIs instead of `del`
This commit is contained in:
Henry Mercer
2025-10-28 15:45:56 +00:00
committed by GitHub
parent e1c8976a56 ea5cb4a016
commit 8cc18acfa4
20 changed files with 3020 additions and 42852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/analyze-action-post.js
Generated
+15 -16
View File
@@ -26507,7 +26507,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
@@ -26728,7 +26727,7 @@ var require_light = __commonJS({
}
}
async trigger(name, ...args) {
var e, promises2;
var e, promises3;
try {
if (name !== "debug") {
this.trigger("debug", `Event triggered: ${name}`, args);
@@ -26739,7 +26738,7 @@ var require_light = __commonJS({
this._events[name] = this._events[name].filter(function(listener) {
return listener.status !== "none";
});
promises2 = this._events[name].map(async (listener) => {
promises3 = this._events[name].map(async (listener) => {
var e2, returned;
if (listener.status === "none") {
return;
@@ -26762,7 +26761,7 @@ var require_light = __commonJS({
return null;
}
});
return (await Promise.all(promises2)).find(function(x) {
return (await Promise.all(promises3)).find(function(x) {
return x != null;
});
} catch (error2) {
@@ -91363,7 +91362,7 @@ var require_stream2 = __commonJS({
var { pipeline } = require_pipeline3();
var { destroyer } = require_destroy2();
var eos = require_end_of_stream();
var promises2 = require_promises();
var promises3 = require_promises();
var utils = require_utils6();
var Stream = module2.exports = require_legacy().Stream;
Stream.isDestroyed = utils.isDestroyed;
@@ -91441,21 +91440,21 @@ var require_stream2 = __commonJS({
configurable: true,
enumerable: true,
get() {
return promises2;
return promises3;
}
});
ObjectDefineProperty(pipeline, customPromisify, {
__proto__: null,
enumerable: true,
get() {
return promises2.pipeline;
return promises3.pipeline;
}
});
ObjectDefineProperty(eos, customPromisify, {
__proto__: null,
enumerable: true,
get() {
return promises2.finished;
return promises3.finished;
}
});
Stream.Stream = Stream;
@@ -91474,7 +91473,7 @@ var require_ours = __commonJS({
"use strict";
var Stream = require("stream");
if (Stream && process.env.READABLE_STREAM === "disable") {
const promises2 = Stream.promises;
const promises3 = Stream.promises;
module2.exports._uint8ArrayToBuffer = Stream._uint8ArrayToBuffer;
module2.exports._isUint8Array = Stream._isUint8Array;
module2.exports.isDisturbed = Stream.isDisturbed;
@@ -91494,13 +91493,13 @@ var require_ours = __commonJS({
configurable: true,
enumerable: true,
get() {
return promises2;
return promises3;
}
});
module2.exports.Stream = Stream.Stream;
} else {
const CustomStream = require_stream2();
const promises2 = require_promises();
const promises3 = require_promises();
const originalDestroy = CustomStream.Readable.destroy;
module2.exports = CustomStream.Readable;
module2.exports._uint8ArrayToBuffer = CustomStream._uint8ArrayToBuffer;
@@ -91523,7 +91522,7 @@ var require_ours = __commonJS({
configurable: true,
enumerable: true,
get() {
return promises2;
return promises3;
}
});
module2.exports.Stream = CustomStream.Stream;
@@ -97754,14 +97753,14 @@ var require_commonjs16 = __commonJS({
if (er)
return results.emit("error", er);
if (follow && !didRealpaths) {
const promises2 = [];
const promises3 = [];
for (const e of entries) {
if (e.isSymbolicLink()) {
promises2.push(e.realpath().then((r) => r?.isUnknown() ? r.lstat() : r));
promises3.push(e.realpath().then((r) => r?.isUnknown() ? r.lstat() : r));
}
}
if (promises2.length) {
Promise.all(promises2).then(() => onReaddir(null, entries, true));
if (promises3.length) {
Promise.all(promises3).then(() => onReaddir(null, entries, true));
return;
}
}
lib/analyze-action.js
Generated
+446 -7079
View File
File diff suppressed because it is too large Load Diff
lib/autobuild-action.js
Generated
-1
View File
@@ -26507,7 +26507,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
lib/init-action-post.js
Generated
+1010 -7643
View File
File diff suppressed because it is too large Load Diff
lib/init-action.js
Generated
+422 -7055
View File
File diff suppressed because it is too large Load Diff
lib/resolve-environment-action.js
Generated
-1
View File
@@ -26507,7 +26507,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
lib/setup-codeql-action.js
Generated
+335 -6967
View File
File diff suppressed because it is too large Load Diff
lib/start-proxy-action-post.js
Generated
-1
View File
@@ -26507,7 +26507,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
lib/start-proxy-action.js
Generated
-1
View File
@@ -45043,7 +45043,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
lib/upload-lib.js
Generated
+363 -6995
View File
File diff suppressed because it is too large Load Diff
lib/upload-sarif-action-post.js
Generated
+15 -16
View File
@@ -26507,7 +26507,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
@@ -26728,7 +26727,7 @@ var require_light = __commonJS({
}
}
async trigger(name, ...args) {
var e, promises;
var e, promises2;
try {
if (name !== "debug") {
this.trigger("debug", `Event triggered: ${name}`, args);
@@ -26739,7 +26738,7 @@ var require_light = __commonJS({
this._events[name] = this._events[name].filter(function(listener) {
return listener.status !== "none";
});
promises = this._events[name].map(async (listener) => {
promises2 = this._events[name].map(async (listener) => {
var e2, returned;
if (listener.status === "none") {
return;
@@ -26762,7 +26761,7 @@ var require_light = __commonJS({
return null;
}
});
return (await Promise.all(promises)).find(function(x) {
return (await Promise.all(promises2)).find(function(x) {
return x != null;
});
} catch (error2) {
@@ -82810,7 +82809,7 @@ var require_stream2 = __commonJS({
var { pipeline } = require_pipeline3();
var { destroyer } = require_destroy2();
var eos = require_end_of_stream();
var promises = require_promises();
var promises2 = require_promises();
var utils = require_utils6();
var Stream = module2.exports = require_legacy().Stream;
Stream.isDestroyed = utils.isDestroyed;
@@ -82888,21 +82887,21 @@ var require_stream2 = __commonJS({
configurable: true,
enumerable: true,
get() {
return promises;
return promises2;
}
});
ObjectDefineProperty(pipeline, customPromisify, {
__proto__: null,
enumerable: true,
get() {
return promises.pipeline;
return promises2.pipeline;
}
});
ObjectDefineProperty(eos, customPromisify, {
__proto__: null,
enumerable: true,
get() {
return promises.finished;
return promises2.finished;
}
});
Stream.Stream = Stream;
@@ -82921,7 +82920,7 @@ var require_ours = __commonJS({
"use strict";
var Stream = require("stream");
if (Stream && process.env.READABLE_STREAM === "disable") {
const promises = Stream.promises;
const promises2 = Stream.promises;
module2.exports._uint8ArrayToBuffer = Stream._uint8ArrayToBuffer;
module2.exports._isUint8Array = Stream._isUint8Array;
module2.exports.isDisturbed = Stream.isDisturbed;
@@ -82941,13 +82940,13 @@ var require_ours = __commonJS({
configurable: true,
enumerable: true,
get() {
return promises;
return promises2;
}
});
module2.exports.Stream = Stream.Stream;
} else {
const CustomStream = require_stream2();
const promises = require_promises();
const promises2 = require_promises();
const originalDestroy = CustomStream.Readable.destroy;
module2.exports = CustomStream.Readable;
module2.exports._uint8ArrayToBuffer = CustomStream._uint8ArrayToBuffer;
@@ -82970,7 +82969,7 @@ var require_ours = __commonJS({
configurable: true,
enumerable: true,
get() {
return promises;
return promises2;
}
});
module2.exports.Stream = CustomStream.Stream;
@@ -89201,14 +89200,14 @@ var require_commonjs16 = __commonJS({
if (er)
return results.emit("error", er);
if (follow && !didRealpaths) {
const promises = [];
const promises2 = [];
for (const e of entries) {
if (e.isSymbolicLink()) {
promises.push(e.realpath().then((r) => r?.isUnknown() ? r.lstat() : r));
promises2.push(e.realpath().then((r) => r?.isUnknown() ? r.lstat() : r));
}
}
if (promises.length) {
Promise.all(promises).then(() => onReaddir(null, entries, true));
if (promises2.length) {
Promise.all(promises2).then(() => onReaddir(null, entries, true));
return;
}
}
lib/upload-sarif-action.js
Generated
+373 -7005
View File
File diff suppressed because it is too large Load Diff
package-lock.json
Generated
+25 -45
View File
@@ -24,7 +24,6 @@
"@schemastore/package": "0.0.10",
"archiver": "^7.0.1",
"console-log-level": "^1.4.1",
"del": "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
@@ -1616,6 +1615,7 @@
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"dev": true,
"license": "MIT",
"dependencies": {
"@nodelib/fs.stat": "2.0.5",
@@ -1627,6 +1627,7 @@
},
"node_modules/@nodelib/fs.stat": {
"version": "2.0.5",
"dev": true,
"license": "MIT",
"engines": {
"node": ">= 8"
@@ -1634,6 +1635,7 @@
},
"node_modules/@nodelib/fs.walk": {
"version": "1.2.8",
"dev": true,
"license": "MIT",
"dependencies": {
"@nodelib/fs.scandir": "2.1.5",
@@ -4108,6 +4110,7 @@
},
"node_modules/braces": {
"version": "3.0.3",
"dev": true,
"license": "MIT",
"dependencies": {
"fill-range": "^7.1.1"
@@ -4697,38 +4700,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/del": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/del/-/del-8.0.0.tgz",
"integrity": "sha512-R6ep6JJ+eOBZsBr9esiNN1gxFbZE4Q2cULkUSFumGYecAiS6qodDvcPx/sFuWHMNul7DWmrtoEOpYSm7o6tbSA==",
"license": "MIT",
"dependencies": {
"globby": "^14.0.2",
"is-glob": "^4.0.3",
"is-path-cwd": "^3.0.0",
"is-path-inside": "^4.0.0",
"p-map": "^7.0.2",
"slash": "^5.1.0"
},
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/del/node_modules/is-path-inside": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
"integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/delayed-stream": {
"version": "1.0.0",
"license": "MIT",
@@ -5780,6 +5751,7 @@
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
"dev": true,
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
@@ -5825,6 +5797,7 @@
},
"node_modules/fastq": {
"version": "1.8.0",
"dev": true,
"license": "ISC",
"dependencies": {
"reusify": "^1.0.4"
@@ -5864,6 +5837,7 @@
},
"node_modules/fill-range": {
"version": "7.1.1",
"dev": true,
"license": "MIT",
"dependencies": {
"to-regex-range": "^5.0.1"
@@ -6140,6 +6114,7 @@
},
"node_modules/glob-parent": {
"version": "5.1.2",
"dev": true,
"license": "ISC",
"dependencies": {
"is-glob": "^4.0.1"
@@ -6196,6 +6171,7 @@
"version": "14.1.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
"integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@sindresorhus/merge-streams": "^2.1.0",
@@ -6216,6 +6192,7 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
"integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=18"
@@ -6228,6 +6205,7 @@
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
"integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">= 4"
@@ -6589,6 +6567,7 @@
},
"node_modules/is-extglob": {
"version": "2.1.1",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
@@ -6603,6 +6582,7 @@
},
"node_modules/is-glob": {
"version": "4.0.3",
"dev": true,
"license": "MIT",
"dependencies": {
"is-extglob": "^2.1.1"
@@ -6632,6 +6612,7 @@
},
"node_modules/is-number": {
"version": "7.0.0",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.12.0"
@@ -6651,18 +6632,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/is-path-cwd": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz",
"integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==",
"license": "MIT",
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/is-path-inside": {
"version": "3.0.3",
"dev": true,
@@ -7120,6 +7089,7 @@
},
"node_modules/merge2": {
"version": "1.4.1",
"dev": true,
"license": "MIT",
"engines": {
"node": ">= 8"
@@ -7129,6 +7099,7 @@
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
"dev": true,
"dependencies": {
"braces": "^3.0.3",
"picomatch": "^2.3.1"
@@ -7613,6 +7584,7 @@
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
"integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
"dev": true,
"engines": {
"node": ">=18"
},
@@ -7706,6 +7678,7 @@
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
"integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=18"
@@ -7723,6 +7696,7 @@
},
"node_modules/picomatch": {
"version": "2.3.1",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8.6"
@@ -7838,6 +7812,7 @@
},
"node_modules/queue-microtask": {
"version": "1.2.3",
"dev": true,
"funding": [
{
"type": "github",
@@ -7990,6 +7965,7 @@
},
"node_modules/reusify": {
"version": "1.0.4",
"dev": true,
"license": "MIT",
"engines": {
"iojs": ">=1.0.0",
@@ -8031,6 +8007,7 @@
},
"node_modules/run-parallel": {
"version": "1.2.0",
"dev": true,
"funding": [
{
"type": "github",
@@ -8242,6 +8219,7 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
"integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=14.16"
@@ -8762,6 +8740,7 @@
},
"node_modules/to-regex-range": {
"version": "5.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
"is-number": "^7.0.0"
@@ -9093,6 +9072,7 @@
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
"integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
"dev": true,
"engines": {
"node": ">=18"
},
package.json
-1
View File
@@ -39,7 +39,6 @@
"@schemastore/package": "0.0.10",
"archiver": "^7.0.1",
"console-log-level": "^1.4.1",
"del": "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
"get-folder-size": "^5.0.0",
src/analyze.ts
+1 -2
View File
@@ -3,7 +3,6 @@ import * as path from "path";
import { performance } from "perf_hooks";
import * as io from "@actions/io";
import * as del from "del";
import * as yaml from "js-yaml";
import { getTemporaryDirectory, PullRequestBranches } from "./actions-util";
@@ -671,7 +670,7 @@ export async function runFinalize(
logger: Logger,
): Promise<DatabaseCreationTimings> {
try {
await del.deleteAsync(outputDir, { force: true });
await fs.promises.rm(outputDir, { force: true, recursive: true });
} catch (error: any) {
if (error?.code !== "ENOENT") {
throw error;
src/codeql.test.ts
+2 -3
View File
@@ -5,7 +5,6 @@ import * as toolrunner from "@actions/exec/lib/toolrunner";
import * as io from "@actions/io";
import * as toolcache from "@actions/tool-cache";
import test, { ExecutionContext } from "ava";
import * as del from "del";
import * as yaml from "js-yaml";
import nock from "nock";
import * as sinon from "sinon";
@@ -557,7 +556,7 @@ const injectedConfigMacro = test.macro({
const augmentedConfig = yaml.load(fs.readFileSync(configFile, "utf8"));
t.deepEqual(augmentedConfig, expectedConfig);
await del.deleteAsync(configFile, { force: true });
await fs.promises.rm(configFile, { force: true });
});
},
@@ -1046,7 +1045,7 @@ test("Avoids duplicating --overwrite flag if specified in CODEQL_ACTION_EXTRA_OP
);
t.truthy(configArg, "Should have injected a codescanning config");
const configFile = configArg!.split("=")[1];
await del.deleteAsync(configFile, { force: true });
await fs.promises.rm(configFile, { force: true });
});
export function stubToolRunnerConstructor(
src/debug-artifacts.ts
+1 -2
View File
@@ -5,7 +5,6 @@ import * as artifact from "@actions/artifact";
import * as artifactLegacy from "@actions/artifact-legacy";
import * as core from "@actions/core";
import archiver from "archiver";
import * as del from "del";
import { getOptionalInput, getTemporaryDirectory } from "./actions-util";
import { dbIsFinalized } from "./analyze";
@@ -345,7 +344,7 @@ async function createPartialDatabaseBundle(
);
// See `bundleDb` for explanation behind deleting existing db bundle.
if (fs.existsSync(databaseBundlePath)) {
await del.deleteAsync(databaseBundlePath, { force: true });
await fs.promises.rm(databaseBundlePath, { force: true });
}
const output = fs.createWriteStream(databaseBundlePath);
const zip = archiver("zip");
src/tar.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import * as semver from "semver";
import { CommandInvocationError } from "./actions-util";
import { Logger } from "./logging";
import { assertNever, cleanUpGlob, isBinaryAccessible } from "./util";
import { assertNever, cleanUpPath, isBinaryAccessible } from "./util";
const MIN_REQUIRED_BSD_TAR_VERSION = "3.4.3";
const MIN_REQUIRED_GNU_TAR_VERSION = "1.31";
@@ -217,7 +217,7 @@ export async function extractTarZst(
});
});
} catch (e) {
await cleanUpGlob(dest, "extraction destination directory", logger);
await cleanUpPath(dest, "extraction destination directory", logger);
throw e;
}
}
src/tools-download.ts
+3 -3
View File
@@ -12,7 +12,7 @@ import * as semver from "semver";
import { formatDuration, Logger } from "./logging";
import * as tar from "./tar";
import { cleanUpGlob, getErrorMessage, getRequiredEnvParam } from "./util";
import { cleanUpPath, getErrorMessage, getRequiredEnvParam } from "./util";
/**
* High watermark to use when streaming the download and extraction of the CodeQL tools.
@@ -130,7 +130,7 @@ export async function downloadAndExtract(
// If we failed during processing, we want to clean up the destination directory
// before we try again.
await cleanUpGlob(dest, "CodeQL bundle", logger);
await cleanUpPath(dest, "CodeQL bundle", logger);
}
const toolsDownloadStart = performance.now();
@@ -167,7 +167,7 @@ export async function downloadAndExtract(
)}).`,
);
} finally {
await cleanUpGlob(archivedBundlePath, "CodeQL bundle archive", logger);
await cleanUpPath(archivedBundlePath, "CodeQL bundle archive", logger);
}
return {
src/util.ts
+7 -14
View File
@@ -6,7 +6,6 @@ import * as path from "path";
import * as core from "@actions/core";
import * as exec from "@actions/exec/lib/exec";
import * as io from "@actions/io";
import * as del from "del";
import getFolderSize from "get-folder-size";
import * as yaml from "js-yaml";
import * as semver from "semver";
@@ -167,7 +166,7 @@ export async function withTmpDir<T>(
): Promise<T> {
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "codeql-action-"));
const result = await body(tmpDir);
await del.deleteAsync(tmpDir, { force: true });
await fs.promises.rm(tmpDir, { force: true, recursive: true });
return result;
}
@@ -756,7 +755,7 @@ export async function bundleDb(
// from somewhere else or someone trying to make the action upload a
// non-database file.
if (fs.existsSync(databaseBundlePath)) {
await del.deleteAsync(databaseBundlePath, { force: true });
await fs.promises.rm(databaseBundlePath, { force: true });
}
await codeql.databaseBundle(databasePath, databaseBundlePath, dbName);
return databaseBundlePath;
@@ -1256,19 +1255,13 @@ export async function checkSipEnablement(
}
}
export async function cleanUpGlob(glob: string, name: string, logger: Logger) {
export async function cleanUpPath(file: string, name: string, logger: Logger) {
logger.debug(`Cleaning up ${name}.`);
try {
const deletedPaths = await del.deleteAsync(glob, { force: true });
if (deletedPaths.length === 0) {
logger.warning(
`Failed to clean up ${name}: no files found matching ${glob}.`,
);
} else if (deletedPaths.length === 1) {
logger.debug(`Cleaned up ${name}.`);
} else {
logger.debug(`Cleaned up ${name} (${deletedPaths.length} files).`);
}
await fs.promises.rm(file, {
force: true,
recursive: true,
});
} catch (e) {
logger.warning(`Failed to clean up ${name}: ${e}.`);
}