Skip to content

Commit

Permalink
Merge branch 'releases/v4' of https://github.com/JamesIves/github-pag…
Browse files Browse the repository at this point in the history
…es-deploy-action into releases/v4
  • Loading branch information
JamesIves committed Apr 23, 2022
2 parents 7eb191b + e90f003 commit 131fed3
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions lib/git.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@ function init(action) {
try {
(0, core_1.info)(`Deploying using ${action.tokenType}… 🔑`);
(0, core_1.info)('Configuring git…');
try {
yield (0, execute_1.execute)(`git config --global --add safe.directory "${action.workspace}"`, action.workspace, action.silent);
}
catch (_a) {
(0, core_1.info)('Unable to set workspace as a safe directory…');
}
// try {
// await execute(
// `git config --global --add safe.directory "${action.workspace}"`,
// action.workspace,
// action.silent
// )
// } catch {
// info('Unable to set workspace as a safe directory…')
// }
yield (0, execute_1.execute)(`git config user.name "${action.name}"`, action.workspace, action.silent);
yield (0, execute_1.execute)(`git config user.email "${action.email}"`, action.workspace, action.silent);
yield (0, execute_1.execute)(`git config core.ignorecase false`, action.workspace, action.silent);
Expand All @@ -46,7 +49,7 @@ function init(action) {
throw new Error();
}
}
catch (_b) {
catch (_a) {
(0, core_1.info)('Unable to unset previous git config authentication as it may not exist, continuing…');
}
try {
Expand All @@ -55,7 +58,7 @@ function init(action) {
throw new Error();
}
}
catch (_c) {
catch (_b) {
(0, core_1.info)('Attempted to remove origin but failed, continuing…');
}
yield (0, execute_1.execute)(`git remote add origin ${action.repositoryPath}`, action.workspace, action.silent);
Expand Down

0 comments on commit 131fed3

Please sign in to comment.