1
0

Compare commits

..

10 Commits

Author SHA1 Message Date
Vallie Joseph
c22ccee38a . 2022-12-06 18:57:47 +00:00
Vallie Joseph
34070387ee . 2022-12-06 18:54:44 +00:00
Vallie Joseph
58c9d1fc61 . 2022-12-06 18:50:27 +00:00
Vallie Joseph
13f797543f . 2022-12-06 18:46:32 +00:00
Vallie Joseph
763ea18a94 . 2022-12-06 18:42:02 +00:00
Vallie Joseph
a20b6de448 . 2022-12-06 18:31:54 +00:00
Vallie Joseph
07918fc7c9 . 2022-12-06 18:19:13 +00:00
Vallie Joseph
24234e3dfa . 2022-12-06 18:11:48 +00:00
Vallie Joseph
637bbe688e . 2022-12-06 18:05:33 +00:00
Vallie Joseph
b63c69da2f . 2022-12-06 17:16:20 +00:00
5 changed files with 11 additions and 29 deletions

Binary file not shown.

22
dist/index.js vendored
View File

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

4
package-lock.json generated
View File

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

View File

@@ -4,7 +4,7 @@
"description": "checkout action",
"main": "lib/main.js",
"scripts": {
"build-full": "npm run format && npm run build && npm run test",
"build-full": "npm i --package-lock && npm ci && 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.4.tgz",
"@actions/io": "file:actions-io-1.1.3.tgz",
"@actions/tool-cache": "^1.1.2",
"uuid": "^3.3.3"
},

View File

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