mirror of
https://github.com/JamesIves/github-pages-deploy-action.git
synced 2023-12-15 20:03:39 +08:00
Merge branch 'releases/v4-init' of https://github.com/JamesIves/github-pages-deploy-action into releases/v4-init
This commit is contained in:
commit
ad0890fdfa
27
lib/git.js
27
lib/git.js
@ -26,31 +26,12 @@ function init(action) {
|
||||
try {
|
||||
(0, core_1.info)(`Deploying using ${action.tokenType}… 🔑`);
|
||||
(0, core_1.info)('Configuring git…');
|
||||
function configure(throwOnError) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
yield (0, execute_1.execute)(`git init`, action.workspace, action.silent);
|
||||
yield (0, execute_1.execute)(`git commit -m "Initial commit" --allow-empty`, action.workspace, action.silent);
|
||||
yield (0, execute_1.execute)(`git config --global --add safe.directory "${action.workspace}"`, action.workspace, action.silent);
|
||||
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);
|
||||
}
|
||||
catch (_a) {
|
||||
(0, core_1.info)('There was a problemissue initilizing git, attempting to resolve …');
|
||||
if (throwOnError) {
|
||||
throw new Error();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
try {
|
||||
yield configure(false);
|
||||
}
|
||||
catch (_a) {
|
||||
// Attempt to re-run if initial configuration failed using git init.
|
||||
yield (0, execute_1.execute)(`git init`, action.workspace, action.silent);
|
||||
yield (0, execute_1.execute)(`git commit -m "Initial commit" --allow-empty`, action.workspace, action.silent);
|
||||
yield configure(true);
|
||||
}
|
||||
try {
|
||||
if ((process.env.CI && !action.sshKey) || action.isTest) {
|
||||
/* Ensures that previously set Git configs do not interfere with the deployment.
|
||||
@ -62,7 +43,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 {
|
||||
@ -71,7 +52,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);
|
||||
|
Loading…
Reference in New Issue
Block a user