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

[Issue-111] Deployment Hotfix (#113)

Browse Source 
* hotfix-1

* f

* Unit test fixes

* s

* Change

* lk

* Update git.test.ts
This commit is contained in:
James Ives 2020-01-08 08:32:47 -05:00 committed by GitHub
parent a84ddb95d9
commit 6d7895db3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/git.test.ts
View File

@ -30,7 +30,7 @@ describe("git", () => {
}); });
const call = await init(); const call = await init();
expect(execute).toBeCalledTimes(4); expect(execute).toBeCalledTimes(3);
expect(call).toBe("Initialization step complete..."); expect(call).toBe("Initialization step complete...");
}); });
@ -46,7 +46,7 @@ describe("git", () => {
const call = await init(); const call = await init();
expect(execute).toBeCalledTimes(4); expect(execute).toBeCalledTimes(3);
expect(call).toBe("Initialization step complete..."); expect(call).toBe("Initialization step complete...");
}); });
@ -109,7 +109,7 @@ describe("git", () => {
const call = await init(); const call = await init();
expect(execute).toBeCalledTimes(4); expect(execute).toBeCalledTimes(3);
expect(call).toBe("Initialization step complete..."); expect(call).toBe("Initialization step complete...");
}); });
}); });

4
lib/git.js
View File

@ -68,7 +68,7 @@ function generateBranch() {
yield util_1.execute(`git reset --hard`, constants_1.workspace); yield util_1.execute(`git reset --hard`, constants_1.workspace);
yield util_1.execute(`git commit --allow-empty -m "Initial ${constants_1.action.branch} commit."`, constants_1.workspace); yield util_1.execute(`git commit --allow-empty -m "Initial ${constants_1.action.branch} commit."`, constants_1.workspace);
yield util_1.execute(`git push ${constants_1.repositoryPath} ${constants_1.action.branch}`, constants_1.workspace); yield util_1.execute(`git push ${constants_1.repositoryPath} ${constants_1.action.branch}`, constants_1.workspace);
yield switchToBaseBranch(); yield util_1.execute(`git fetch`, constants_1.workspace);
} }
catch (error) { catch (error) {
core.setFailed(`There was an error creating the deployment branch: ${error} ❌`); core.setFailed(`There was an error creating the deployment branch: ${error} ❌`);
@ -97,7 +97,7 @@ function deploy() {
} }
// Checks out the base branch to begin the deployment process. // Checks out the base branch to begin the deployment process.
yield switchToBaseBranch(); yield switchToBaseBranch();
yield util_1.execute(`git fetch origin`, constants_1.workspace); yield util_1.execute(`git fetch ${constants_1.repositoryPath}`, constants_1.workspace);
yield util_1.execute(`git worktree add --checkout ${temporaryDeploymentDirectory} origin/${constants_1.action.branch}`, constants_1.workspace); yield util_1.execute(`git worktree add --checkout ${temporaryDeploymentDirectory} origin/${constants_1.action.branch}`, constants_1.workspace);
// Ensures that items that need to be excluded from the clean job get parsed. // Ensures that items that need to be excluded from the clean job get parsed.
let excludes = ""; let excludes = "";

5
src/git.ts
View File

@ -22,7 +22,6 @@ export async function init(): Promise<any> {
await execute(`git init`, workspace); await execute(`git init`, workspace);
await execute(`git config user.name ${action.name}`, workspace); await execute(`git config user.name ${action.name}`, workspace);
await execute(`git config user.email ${action.email}`, workspace); await execute(`git config user.email ${action.email}`, workspace);
await execute(`git fetch origin`, workspace);
} catch (error) { } catch (error) {
core.setFailed(`There was an error initializing the repository: ${error}`); core.setFailed(`There was an error initializing the repository: ${error}`);
} finally { } finally {
@ -58,7 +57,7 @@ export async function generateBranch(): Promise<any> {
workspace workspace
); );
await execute(`git push ${repositoryPath} ${action.branch}`, workspace); await execute(`git push ${repositoryPath} ${action.branch}`, workspace);
await switchToBaseBranch(); await execute(`git fetch`, workspace);
} catch (error) { } catch (error) {
core.setFailed( core.setFailed(
`There was an error creating the deployment branch: ${error} ❌` `There was an error creating the deployment branch: ${error} ❌`
@ -89,7 +88,7 @@ export async function deploy(): Promise<any> {
// Checks out the base branch to begin the deployment process. // Checks out the base branch to begin the deployment process.
await switchToBaseBranch(); await switchToBaseBranch();
await execute(`git fetch origin`, workspace); await execute(`git fetch ${repositoryPath}`, workspace);
await execute( await execute(
`git worktree add --checkout ${temporaryDeploymentDirectory} origin/${action.branch}`, `git worktree add --checkout ${temporaryDeploymentDirectory} origin/${action.branch}`,
workspace workspace