diff --git a/actions-io-1.1.4.tgz b/actions-io-1.1.4.tgz index 9497c7d..4719043 100644 Binary files a/actions-io-1.1.4.tgz and b/actions-io-1.1.4.tgz differ diff --git a/dist/index.js b/dist/index.js index 5fa853f..00ec095 100644 --- a/dist/index.js +++ b/dist/index.js @@ -133,7 +133,6 @@ const childProcess = __importStar(__webpack_require__(129)); const path = __importStar(__webpack_require__(622)); const util_1 = __webpack_require__(669); const ioUtil = __importStar(__webpack_require__(672)); -const exec = util_1.promisify(childProcess.exec); const execFile = util_1.promisify(childProcess.execFile); /** * Copies a file or folder. @@ -225,13 +224,17 @@ function rmRF(inputPath) { try { const cmdPath = ioUtil.getCmdPath(); if (yield ioUtil.isDirectory(inputPath, true)) { - yield exec(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, { + yield execFile(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, { env: { inputPath } + }).catch(error => { + throw new Error(`Failed to remove directory: ${error.message}`); }); } else { - yield exec(`${cmdPath} /s /c "del /f /a "%inputPath%""`, { + yield execFile(`${cmdPath} /s /c "del /f /a "%inputPath%""`, { env: { inputPath } + }).catch(error => { + throw new Error(`Failed to remove directory: ${error.message}`); }); } } @@ -243,7 +246,7 @@ function rmRF(inputPath) { } // Shelling out fails to remove a symlink folder with missing source, this unlink catches that try { - yield ioUtil.unlink(inputPath); + yield ioUtil.unlink(ioUtil.normalizeSeparators(inputPath)); } catch (err) { // if you try to delete a file that doesn't exist, desired result is achieved @@ -424,7 +427,7 @@ function copyFile(srcFile, destFile, force) { // Try to override file permission if (e.code === 'EPERM') { yield ioUtil.chmod(destFile, '0666'); - yield ioUtil.unlink(destFile); + yield ioUtil.rmdir(destFile); } // other errors = it doesn't exist, no work to do } @@ -7206,7 +7209,14 @@ class GitAuthHelper { if (((_a = this.temporaryHomePath) === null || _a === void 0 ? void 0 : _a.length) > 0) { core.debug(`Unsetting HOME override`); this.git.removeEnvironmentVariable('HOME'); - yield io.rmRF(this.temporaryHomePath); + core.info(`hi there: ${this.temporaryHomePath}`); + yield io + .rmRF(this.temporaryHomePath) + // eslint-disable-next-line github/no-then + .catch(err => { + // eslint-disable-next-line i18n-text/no-en + core.warning(`Failed to remove temporary checkout directory: ${err}`); + }); } }); } diff --git a/package-lock.json b/package-lock.json index a674580..50ee2cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,8 +59,8 @@ } }, "@actions/io": { - "version": "file:actions-io-1.1.3.tgz", - "integrity": "sha512-GJsPQzUKCnXjTYzTIyA0lfY3vpTCrD2+YyyQEq7WakKF5c7YPR2Ox3PjMnPrSWvseAkEOXz1ZfcidXN7EqLn5w==" + "version": "file:actions-io-1.1.4.tgz", + "integrity": "sha512-JM4u7MrkRNjgr8wveZbtihhESfGR6lfV819G1yLWVF1yIhoVkRpVElv28kYFvrh8iU0rWE6VmrOHuZPpspGlcQ==" }, "@actions/tool-cache": { "version": "1.1.2", diff --git a/package.json b/package.json index 11316c3..e590f11 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "checkout action", "main": "lib/main.js", "scripts": { - "build-full": "npm i --package-lock && npm ci && npm run format && npm run build && npm run test", + "build-full": "npm run format && npm run build && npm run test", "build": "tsc && ncc build && node lib/misc/generate-docs.js", "format": "prettier --write '**/*.ts'", "format-check": "prettier --check '**/*.ts'", @@ -32,7 +32,7 @@ "@actions/core": "^1.10.0", "@actions/exec": "^1.0.1", "@actions/github": "^2.2.0", - "@actions/io": "file:actions-io-1.1.3.tgz", + "@actions/io": "file:actions-io-1.1.4.tgz", "@actions/tool-cache": "^1.1.2", "uuid": "^3.3.3" }, diff --git a/src/git-auth-helper.ts b/src/git-auth-helper.ts index 6e3ad28..1689fc6 100644 --- a/src/git-auth-helper.ts +++ b/src/git-auth-helper.ts @@ -197,7 +197,15 @@ class GitAuthHelper { if (this.temporaryHomePath?.length > 0) { core.debug(`Unsetting HOME override`) this.git.removeEnvironmentVariable('HOME') - await io.rmRF(this.temporaryHomePath) + + core.info(`hi there: ${this.temporaryHomePath}`) + await io + .rmRF(this.temporaryHomePath) + // eslint-disable-next-line github/no-then + .catch(err => { + // eslint-disable-next-line i18n-text/no-en + core.warning(`Failed to remove temporary checkout directory: ${err}`) + }) } }