From 0a9984563e6199a44285d325a9921f1bff9517b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wa=C5=9B?= Date: Thu, 4 Aug 2022 23:18:29 +0200 Subject: [PATCH 1/3] Update `@actions/glob` to 0.3.0 --- dist/index.js | 17 +++++++++-------- package-lock.json | 14 +++++++------- package.json | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dist/index.js b/dist/index.js index 67126dee..39ab5548 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2833,14 +2833,14 @@ exports.create = create; * @param patterns Patterns separated by newlines * @param options Glob options */ -function hashFiles(patterns, options) { +function hashFiles(patterns, options, verbose = false) { return __awaiter(this, void 0, void 0, function* () { let followSymbolicLinks = true; if (options && typeof options.followSymbolicLinks === 'boolean') { followSymbolicLinks = options.followSymbolicLinks; } const globber = yield create(patterns, { followSymbolicLinks }); - return internal_hash_files_1.hashFiles(globber); + return internal_hash_files_1.hashFiles(globber, verbose); }); } exports.hashFiles = hashFiles; @@ -7571,10 +7571,11 @@ const fs = __importStar(__webpack_require__(747)); const stream = __importStar(__webpack_require__(413)); const util = __importStar(__webpack_require__(669)); const path = __importStar(__webpack_require__(622)); -function hashFiles(globber) { +function hashFiles(globber, verbose = false) { var e_1, _a; var _b; return __awaiter(this, void 0, void 0, function* () { + const writeDelegate = verbose ? core.info : core.debug; let hasMatch = false; const githubWorkspace = (_b = process.env['GITHUB_WORKSPACE']) !== null && _b !== void 0 ? _b : process.cwd(); const result = crypto.createHash('sha256'); @@ -7582,13 +7583,13 @@ function hashFiles(globber) { try { for (var _c = __asyncValues(globber.globGenerator()), _d; _d = yield _c.next(), !_d.done;) { const file = _d.value; - core.debug(file); + writeDelegate(file); if (!file.startsWith(`${githubWorkspace}${path.sep}`)) { - core.debug(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); + writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } if (fs.statSync(file).isDirectory()) { - core.debug(`Skip directory '${file}'.`); + writeDelegate(`Skip directory '${file}'.`); continue; } const hash = crypto.createHash('sha256'); @@ -7610,11 +7611,11 @@ function hashFiles(globber) { } result.end(); if (hasMatch) { - core.debug(`Found ${count} files to hash.`); + writeDelegate(`Found ${count} files to hash.`); return result.digest('hex'); } else { - core.debug(`No matches found for glob`); + writeDelegate(`No matches found for glob`); return ''; } }); diff --git a/package-lock.json b/package-lock.json index 40768cb6..7f0ec433 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@actions/core": "^1.8.1", "@actions/exec": "^1.1.0", "@actions/github": "^5.0.0", - "@actions/glob": "^0.2.0", + "@actions/glob": "^0.3.0", "@actions/io": "^1.1.1", "@octokit/core": "^3.5.1", "@octokit/plugin-paginate-rest": "^2.17.0", @@ -66,9 +66,9 @@ } }, "node_modules/@actions/glob": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.2.0.tgz", - "integrity": "sha512-mqE2a7I66kxcvsdwxs/filQwZsq25IfktMaviGfDB51v6Q3bvxnV7mFsZnvYtLhqGZbPxwBnH8AD3UYaOWb//w==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz", + "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==", "dependencies": { "@actions/core": "^1.2.6", "minimatch": "^3.0.4" @@ -6212,9 +6212,9 @@ } }, "@actions/glob": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.2.0.tgz", - "integrity": "sha512-mqE2a7I66kxcvsdwxs/filQwZsq25IfktMaviGfDB51v6Q3bvxnV7mFsZnvYtLhqGZbPxwBnH8AD3UYaOWb//w==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz", + "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==", "requires": { "@actions/core": "^1.2.6", "minimatch": "^3.0.4" diff --git a/package.json b/package.json index ffcc3ae2..a35869eb 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@actions/core": "^1.8.1", "@actions/exec": "^1.1.0", "@actions/github": "^5.0.0", - "@actions/glob": "^0.2.0", + "@actions/glob": "^0.3.0", "@actions/io": "^1.1.1", "@octokit/core": "^3.5.1", "@octokit/plugin-paginate-rest": "^2.17.0", @@ -54,4 +54,4 @@ "ts-jest": "^27.0.5", "typescript": "^4.3.5" } -} \ No newline at end of file +} From ca24d5fb29abe19994a46fc7de576709851b4df6 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Tue, 11 Oct 2022 17:31:09 -0400 Subject: [PATCH 2/3] Update `@actions/glob` license version --- .licenses/npm/@actions/glob.dep.yml | 2 +- dist/index.js | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.licenses/npm/@actions/glob.dep.yml b/.licenses/npm/@actions/glob.dep.yml index 2faa14b8..673a1de2 100644 --- a/.licenses/npm/@actions/glob.dep.yml +++ b/.licenses/npm/@actions/glob.dep.yml @@ -1,6 +1,6 @@ --- name: "@actions/glob" -version: 0.2.0 +version: 0.3.0 type: npm summary: Actions glob lib homepage: https://github.com/actions/toolkit/tree/main/packages/glob diff --git a/dist/index.js b/dist/index.js index 833caf19..0fb19de1 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2915,14 +2915,14 @@ exports.create = create; * @param patterns Patterns separated by newlines * @param options Glob options */ -function hashFiles(patterns, options, verbose = false) { +function hashFiles(patterns, options) { return __awaiter(this, void 0, void 0, function* () { let followSymbolicLinks = true; if (options && typeof options.followSymbolicLinks === 'boolean') { followSymbolicLinks = options.followSymbolicLinks; } const globber = yield create(patterns, { followSymbolicLinks }); - return internal_hash_files_1.hashFiles(globber, verbose); + return internal_hash_files_1.hashFiles(globber); }); } exports.hashFiles = hashFiles; @@ -9095,11 +9095,10 @@ const fs = __importStar(__webpack_require__(747)); const stream = __importStar(__webpack_require__(413)); const util = __importStar(__webpack_require__(669)); const path = __importStar(__webpack_require__(622)); -function hashFiles(globber, verbose = false) { +function hashFiles(globber) { var e_1, _a; var _b; return __awaiter(this, void 0, void 0, function* () { - const writeDelegate = verbose ? core.info : core.debug; let hasMatch = false; const githubWorkspace = (_b = process.env['GITHUB_WORKSPACE']) !== null && _b !== void 0 ? _b : process.cwd(); const result = crypto.createHash('sha256'); @@ -9107,13 +9106,13 @@ function hashFiles(globber, verbose = false) { try { for (var _c = __asyncValues(globber.globGenerator()), _d; _d = yield _c.next(), !_d.done;) { const file = _d.value; - writeDelegate(file); + core.debug(file); if (!file.startsWith(`${githubWorkspace}${path.sep}`)) { - writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); + core.debug(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } if (fs.statSync(file).isDirectory()) { - writeDelegate(`Skip directory '${file}'.`); + core.debug(`Skip directory '${file}'.`); continue; } const hash = crypto.createHash('sha256'); @@ -9135,11 +9134,11 @@ function hashFiles(globber, verbose = false) { } result.end(); if (hasMatch) { - writeDelegate(`Found ${count} files to hash.`); + core.debug(`Found ${count} files to hash.`); return result.digest('hex'); } else { - writeDelegate(`No matches found for glob`); + core.debug(`No matches found for glob`); return ''; } }); From ee124b1288886006e1101adf3bdbd25983eb73d0 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Tue, 11 Oct 2022 17:33:09 -0400 Subject: [PATCH 3/3] Update dist --- dist/index.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0fb19de1..833caf19 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2915,14 +2915,14 @@ exports.create = create; * @param patterns Patterns separated by newlines * @param options Glob options */ -function hashFiles(patterns, options) { +function hashFiles(patterns, options, verbose = false) { return __awaiter(this, void 0, void 0, function* () { let followSymbolicLinks = true; if (options && typeof options.followSymbolicLinks === 'boolean') { followSymbolicLinks = options.followSymbolicLinks; } const globber = yield create(patterns, { followSymbolicLinks }); - return internal_hash_files_1.hashFiles(globber); + return internal_hash_files_1.hashFiles(globber, verbose); }); } exports.hashFiles = hashFiles; @@ -9095,10 +9095,11 @@ const fs = __importStar(__webpack_require__(747)); const stream = __importStar(__webpack_require__(413)); const util = __importStar(__webpack_require__(669)); const path = __importStar(__webpack_require__(622)); -function hashFiles(globber) { +function hashFiles(globber, verbose = false) { var e_1, _a; var _b; return __awaiter(this, void 0, void 0, function* () { + const writeDelegate = verbose ? core.info : core.debug; let hasMatch = false; const githubWorkspace = (_b = process.env['GITHUB_WORKSPACE']) !== null && _b !== void 0 ? _b : process.cwd(); const result = crypto.createHash('sha256'); @@ -9106,13 +9107,13 @@ function hashFiles(globber) { try { for (var _c = __asyncValues(globber.globGenerator()), _d; _d = yield _c.next(), !_d.done;) { const file = _d.value; - core.debug(file); + writeDelegate(file); if (!file.startsWith(`${githubWorkspace}${path.sep}`)) { - core.debug(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); + writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } if (fs.statSync(file).isDirectory()) { - core.debug(`Skip directory '${file}'.`); + writeDelegate(`Skip directory '${file}'.`); continue; } const hash = crypto.createHash('sha256'); @@ -9134,11 +9135,11 @@ function hashFiles(globber) { } result.end(); if (hasMatch) { - core.debug(`Found ${count} files to hash.`); + writeDelegate(`Found ${count} files to hash.`); return result.digest('hex'); } else { - core.debug(`No matches found for glob`); + writeDelegate(`No matches found for glob`); return ''; } });