diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 2fcc5c56..8d566b06 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -168,7 +168,7 @@ describe('git', () => { const response = await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(13) + expect(execute).toBeCalledTimes(14) expect(rmRF).toBeCalledTimes(1) expect(response).toBe(Status.SUCCESS) }) @@ -191,7 +191,7 @@ describe('git', () => { const response = await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(12) + expect(execute).toBeCalledTimes(13) expect(rmRF).toBeCalledTimes(1) expect(response).toBe(Status.SUCCESS) }) @@ -216,7 +216,7 @@ describe('git', () => { await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(13) + expect(execute).toBeCalledTimes(14) expect(rmRF).toBeCalledTimes(1) }) @@ -240,7 +240,7 @@ describe('git', () => { await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(12) + expect(execute).toBeCalledTimes(13) expect(rmRF).toBeCalledTimes(1) }) @@ -265,7 +265,7 @@ describe('git', () => { await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(12) + expect(execute).toBeCalledTimes(13) expect(rmRF).toBeCalledTimes(1) }) @@ -296,7 +296,7 @@ describe('git', () => { const response = await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(13) + expect(execute).toBeCalledTimes(14) expect(rmRF).toBeCalledTimes(1) expect(fs.existsSync).toBeCalledTimes(2) expect(response).toBe(Status.SUCCESS) @@ -328,7 +328,7 @@ describe('git', () => { await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(10) + expect(execute).toBeCalledTimes(11) expect(rmRF).toBeCalledTimes(1) }) }) @@ -353,7 +353,7 @@ describe('git', () => { await deploy(action) // Includes the call to generateWorktree - expect(execute).toBeCalledTimes(10) + expect(execute).toBeCalledTimes(11) expect(rmRF).toBeCalledTimes(1) }) @@ -373,7 +373,7 @@ describe('git', () => { await deploy(action) - expect(execute).toBeCalledTimes(10) + expect(execute).toBeCalledTimes(11) expect(rmRF).toBeCalledTimes(1) expect(mkdirP).toBeCalledTimes(1) }) @@ -393,7 +393,7 @@ describe('git', () => { }) const response = await deploy(action) - expect(execute).toBeCalledTimes(10) + expect(execute).toBeCalledTimes(11) expect(rmRF).toBeCalledTimes(1) expect(response).toBe(Status.SKIPPED) }) diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts index 0b29e928..663d6a1d 100644 --- a/__tests__/main.test.ts +++ b/__tests__/main.test.ts @@ -53,7 +53,7 @@ describe('main', () => { debug: true }) await run(action) - expect(execute).toBeCalledTimes(17) + expect(execute).toBeCalledTimes(18) expect(rmRF).toBeCalledTimes(1) expect(exportVariable).toBeCalledTimes(1) }) @@ -73,7 +73,7 @@ describe('main', () => { isTest: TestFlag.HAS_CHANGED_FILES }) await run(action) - expect(execute).toBeCalledTimes(20) + expect(execute).toBeCalledTimes(21) expect(rmRF).toBeCalledTimes(1) expect(exportVariable).toBeCalledTimes(1) }) diff --git a/src/git.ts b/src/git.ts index 50a9659b..157c53cb 100644 --- a/src/git.ts +++ b/src/git.ts @@ -130,6 +130,13 @@ 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 + ) + // Ensures that items that need to be excluded from the clean job get parsed. let excludes = '' if (action.clean && action.cleanExclude) { @@ -324,7 +331,7 @@ export async function deploy(action: ActionInterface): Promise { ) await execute( - `chmod -R 777 ${temporaryDeploymentDirectory}`, + `chmod -R +rw ${temporaryDeploymentDirectory}`, action.workspace, action.silent )