From d34d41a21e013b2b09dbd41b3a1158f97cc69e9c Mon Sep 17 00:00:00 2001 From: James Ives Date: Mon, 25 Apr 2022 21:56:48 -0400 Subject: [PATCH] Modifies permissions --- .github/workflows/integration.yml | 2 +- src/constants.ts | 5 ++--- src/git.ts | 14 +++++++++----- src/ssh.ts | 9 ++++++--- src/util.ts | 6 +++--- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 95d6e0944..681bc8374 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -223,7 +223,7 @@ jobs: integration-container, integration-ssh, integration-ssh-third-party-client, - integration-env + integration-env, ] runs-on: ubuntu-latest steps: diff --git a/src/constants.ts b/src/constants.ts index 6505b7781..80d98e63c 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -105,9 +105,8 @@ export const action: ActionInterface = { ? getInput('git-config-email') : pusher && pusher.email ? pusher.email - : `${ - process.env.GITHUB_ACTOR || 'github-pages-deploy-action' - }@users.noreply.${ + : `${process.env.GITHUB_ACTOR || + 'github-pages-deploy-action'}@users.noreply.${ process.env.GITHUB_SERVER_URL ? stripProtocolFromUrl(process.env.GITHUB_SERVER_URL) : 'github.com' diff --git a/src/git.ts b/src/git.ts index 157c53cb8..1bf788bd7 100644 --- a/src/git.ts +++ b/src/git.ts @@ -131,11 +131,15 @@ export async function deploy(action: ActionInterface): Promise { await generateWorktree(action, temporaryDeploymentDirectory, branchExists) /* Relaxes permissions of folder due to be deployed so rsync can write to/from it. */ - await execute( - `chmod -R +rw ${action.folderPath}`, - action.workspace, - action.silent - ) + try { + await execute( + `chmod -R +rw ${action.folderPath}`, + action.workspace, + action.silent + ) + } catch { + info(`Unable to modify permissions…`) + } // Ensures that items that need to be excluded from the clean job get parsed. let excludes = '' diff --git a/src/ssh.ts b/src/ssh.ts index 1c9039201..359857424 100644 --- a/src/ssh.ts +++ b/src/ssh.ts @@ -23,11 +23,14 @@ export async function configureSSH(action: ActionInterface): Promise { appendFileSync(sshKnownHostsDirectory, sshGitHubKnownHostDss) // Initializes SSH agent. - const agentOutput = execFileSync('ssh-agent').toString().split('\n') + const agentOutput = execFileSync('ssh-agent') + .toString() + .split('\n') agentOutput.map(line => { - const exportableVariables = - /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(line) + const exportableVariables = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec( + line + ) if (exportableVariables && exportableVariables.length) { exportVariable(exportableVariables[1], exportableVariables[2]) diff --git a/src/util.ts b/src/util.ts index 59f7d9821..600b2620f 100644 --- a/src/util.ts +++ b/src/util.ts @@ -96,9 +96,9 @@ export const suppressSensitiveInformation = ( return value } - const orderedByLength = ( - [action.token, action.repositoryPath].filter(Boolean) as string[] - ).sort((a, b) => b.length - a.length) + const orderedByLength = ([action.token, action.repositoryPath].filter( + Boolean + ) as string[]).sort((a, b) => b.length - a.length) for (const find of orderedByLength) { value = replaceAll(value, find, '***')