diff --git a/lib/git.js b/lib/git.js index 587924fe..54952aa8 100644 --- a/lib/git.js +++ b/lib/git.js @@ -56,6 +56,8 @@ function generateBranch() { 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 push ${constants_1.repositoryPath} ${constants_1.action.branch}`, constants_1.workspace); + // Switches back to the base branch. + yield util_1.execute(`git switch ${constants_1.action.baseBranch || "master"}`, constants_1.workspace); } catch (error) { core.setFailed(`There was an error creating the deployment branch: ${error}`); @@ -82,9 +84,6 @@ function deploy() { console.log("Deployment branch does not exist. Creating...."); yield generateBranch(); } - // Checks out the base branch to begin the deployment process. - yield util_1.execute(`git switch ${constants_1.action.baseBranch || "master"}`, constants_1.workspace); - yield util_1.execute(`git fetch origin`, constants_1.workspace); yield util_1.execute(`git add --all .`, constants_1.action.build); yield util_1.execute(`git commit -m "Deploying to ${constants_1.action.branch} from ${constants_1.action.baseBranch} ${process.env.GITHUB_SHA}" --quiet`, constants_1.action.build); yield util_1.execute(`git push --force ${constants_1.repositoryPath} ${constants_1.action.baseBranch}:${constants_1.action.branch}`, constants_1.action.build); diff --git a/src/git.ts b/src/git.ts index adbd1437..cc53d0ed 100644 --- a/src/git.ts +++ b/src/git.ts @@ -44,6 +44,9 @@ export async function generateBranch(): Promise { workspace ); await execute(`git push ${repositoryPath} ${action.branch}`, workspace); + + // Switches back to the base branch. + await execute(`git switch ${action.baseBranch || "master"}`, workspace); } catch (error) { core.setFailed( `There was an error creating the deployment branch: ${error}` @@ -73,10 +76,6 @@ export async function deploy(): Promise { await generateBranch(); } - // Checks out the base branch to begin the deployment process. - await execute(`git switch ${action.baseBranch || "master"}`, workspace); - await execute(`git fetch origin`, workspace); - await execute(`git add --all .`, action.build); await execute( `git commit -m "Deploying to ${action.branch} from ${action.baseBranch} ${process.env.GITHUB_SHA}" --quiet`,