adk23333/github-pages-deploy-action
1
0
Fork 0
mirror of https://github.com/JamesIves/github-pages-deploy-action.git synced 2023-12-15 20:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'init-commit' into releases/v4-init

Browse Source
This commit is contained in:
James Ives 2022-04-27 10:41:49 -04:00
commit 781d9e3ced
1 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/git.ts
View File

@ -21,8 +21,14 @@ export async function init(action: ActionInterface): Promise<void | Error> {
info(`Deploying using ${action.tokenType}… 🔑`) info(`Deploying using ${action.tokenType}… 🔑`)
info('Configuring git…') info('Configuring git…')
async function configure(throwOnError: boolean) { await execute(`git init`, action.workspace, action.silent)
try {
await execute(
`git commit -m "Initial commit" --allow-empty`,
action.workspace,
action.silent
)
await execute( await execute(
`git config --global --add safe.directory "${action.workspace}"`, `git config --global --add safe.directory "${action.workspace}"`,
action.workspace, action.workspace,
@ -46,30 +52,6 @@ export async function init(action: ActionInterface): Promise<void | Error> {
action.workspace, action.workspace,
action.silent action.silent
) )
} catch {
info(
'There was a problemissue initilizing git, attempting to resolve …'
)
if (throwOnError) {
throw new Error()
}
}
}
try {
await configure(false)
} catch {
// Attempt to re-run if initial configuration failed using git init.
await execute(`git init`, action.workspace, action.silent)
await execute(
`git commit -m "Initial commit" --allow-empty`,
action.workspace,
action.silent
)
await configure(true)
}
try { try {
if ((process.env.CI && !action.sshKey) || action.isTest) { if ((process.env.CI && !action.sshKey) || action.isTest) {