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 'dev' into releases/v3

Browse Source
This commit is contained in:
James Ives 2020-05-24 11:25:02 -04:00
commit 7b5eb6be51
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/constants.ts
View File

@ -67,9 +67,8 @@ export const action: ActionInterface = {
? getInput('GIT_CONFIG_EMAIL') ? getInput('GIT_CONFIG_EMAIL')
: pusher && pusher.email : pusher && pusher.email
? pusher.email ? pusher.email
: `${ : `${process.env.GITHUB_ACTOR ||
process.env.GITHUB_ACTOR || 'github-pages-deploy-action' 'github-pages-deploy-action'}@users.noreply.github.com`,
}@users.noreply.github.com`,
gitHubToken: getInput('GITHUB_TOKEN'), gitHubToken: getInput('GITHUB_TOKEN'),
name: !isNullOrUndefined(getInput('GIT_CONFIG_NAME')) name: !isNullOrUndefined(getInput('GIT_CONFIG_NAME'))
? getInput('GIT_CONFIG_NAME') ? getInput('GIT_CONFIG_NAME')

2
src/git.ts
View File

@ -245,7 +245,7 @@ export async function deploy(action: ActionInterface): Promise<Status> {
// Cleans up temporary files/folders and restores the git state. // Cleans up temporary files/folders and restores the git state.
info('Running post deployment cleanup jobs… 🗑️') info('Running post deployment cleanup jobs… 🗑️')
await execute( await execute(
`git worktree remove ${temporaryDeploymentDirectory}`, `git worktree remove ${temporaryDeploymentDirectory} --force`,
action.workspace action.workspace
) )
await rmRF(temporaryDeploymentDirectory) await rmRF(temporaryDeploymentDirectory)

7
src/util.ts
View File

@ -19,9 +19,10 @@ export const generateTokenType = (action: ActionInterface): string =>
export const generateRepositoryPath = (action: ActionInterface): string => export const generateRepositoryPath = (action: ActionInterface): string =>
action.ssh action.ssh
? `git@github.com:${action.repositoryName}` ? `git@github.com:${action.repositoryName}`
: `https://${ : `https://${action.accessToken ||
action.accessToken || `x-access-token:${action.gitHubToken}` `x-access-token:${action.gitHubToken}`}@github.com/${
}@github.com/${action.repositoryName}.git` action.repositoryName
}.git`
/* Checks for the required tokens and formatting. Throws an error if any case is matched. */ /* Checks for the required tokens and formatting. Throws an error if any case is matched. */
export const hasRequiredParameters = (action: ActionInterface): void => { export const hasRequiredParameters = (action: ActionInterface): void => {