Compare commits

..

No commits in common. "c22ccee38a13e34cb01a103c324adb1db665821e" and "e3d7676897c56a31dd9bc8c2c0b72bb61221fb21" have entirely different histories.

5 changed files with 29 additions and 11 deletions

Binary file not shown.

22
dist/index.js vendored
View File

@ -133,7 +133,6 @@ const childProcess = __importStar(__webpack_require__(129));
const path = __importStar(__webpack_require__(622)); const path = __importStar(__webpack_require__(622));
const util_1 = __webpack_require__(669); const util_1 = __webpack_require__(669);
const ioUtil = __importStar(__webpack_require__(672)); const ioUtil = __importStar(__webpack_require__(672));
const exec = util_1.promisify(childProcess.exec);
const execFile = util_1.promisify(childProcess.execFile); const execFile = util_1.promisify(childProcess.execFile);
/** /**
* Copies a file or folder. * Copies a file or folder.
@ -225,13 +224,17 @@ function rmRF(inputPath) {
try { try {
const cmdPath = ioUtil.getCmdPath(); const cmdPath = ioUtil.getCmdPath();
if (yield ioUtil.isDirectory(inputPath, true)) { 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 } env: { inputPath }
}).catch(error => {
throw new Error(`Failed to remove directory: ${error.message}`);
}); });
} }
else { else {
yield exec(`${cmdPath} /s /c "del /f /a "%inputPath%""`, { yield execFile(`${cmdPath} /s /c "del /f /a "%inputPath%""`, {
env: { 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 // Shelling out fails to remove a symlink folder with missing source, this unlink catches that
try { try {
yield ioUtil.unlink(inputPath); yield ioUtil.unlink(ioUtil.normalizeSeparators(inputPath));
} }
catch (err) { catch (err) {
// if you try to delete a file that doesn't exist, desired result is achieved // 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 // Try to override file permission
if (e.code === 'EPERM') { if (e.code === 'EPERM') {
yield ioUtil.chmod(destFile, '0666'); yield ioUtil.chmod(destFile, '0666');
yield ioUtil.unlink(destFile); yield ioUtil.rmdir(destFile);
} }
// other errors = it doesn't exist, no work to do // 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) { if (((_a = this.temporaryHomePath) === null || _a === void 0 ? void 0 : _a.length) > 0) {
core.debug(`Unsetting HOME override`); core.debug(`Unsetting HOME override`);
this.git.removeEnvironmentVariable('HOME'); 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}`);
});
} }
}); });
} }

4
package-lock.json generated
View File

@ -59,8 +59,8 @@
} }
}, },
"@actions/io": { "@actions/io": {
"version": "file:actions-io-1.1.3.tgz", "version": "file:actions-io-1.1.4.tgz",
"integrity": "sha512-GJsPQzUKCnXjTYzTIyA0lfY3vpTCrD2+YyyQEq7WakKF5c7YPR2Ox3PjMnPrSWvseAkEOXz1ZfcidXN7EqLn5w==" "integrity": "sha512-JM4u7MrkRNjgr8wveZbtihhESfGR6lfV819G1yLWVF1yIhoVkRpVElv28kYFvrh8iU0rWE6VmrOHuZPpspGlcQ=="
}, },
"@actions/tool-cache": { "@actions/tool-cache": {
"version": "1.1.2", "version": "1.1.2",

View File

@ -4,7 +4,7 @@
"description": "checkout action", "description": "checkout action",
"main": "lib/main.js", "main": "lib/main.js",
"scripts": { "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", "build": "tsc && ncc build && node lib/misc/generate-docs.js",
"format": "prettier --write '**/*.ts'", "format": "prettier --write '**/*.ts'",
"format-check": "prettier --check '**/*.ts'", "format-check": "prettier --check '**/*.ts'",
@ -32,7 +32,7 @@
"@actions/core": "^1.10.0", "@actions/core": "^1.10.0",
"@actions/exec": "^1.0.1", "@actions/exec": "^1.0.1",
"@actions/github": "^2.2.0", "@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", "@actions/tool-cache": "^1.1.2",
"uuid": "^3.3.3" "uuid": "^3.3.3"
}, },

View File

@ -197,7 +197,15 @@ class GitAuthHelper {
if (this.temporaryHomePath?.length > 0) { if (this.temporaryHomePath?.length > 0) {
core.debug(`Unsetting HOME override`) core.debug(`Unsetting HOME override`)
this.git.removeEnvironmentVariable('HOME') 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}`)
})
} }
} }