Skip to content

Commit

Permalink
build(release): compiled action for 1.2.1
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
semantic-release-bot committed Oct 8, 2019
1 parent a99cd41 commit f9c177e
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,13 +626,19 @@ async function checkOutRemoteBranch(branch) {
return true;
}

core.debug(`fetching "${branch}" branch from remote`);
await command(
`git fetch https://x-access-token:${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${branch}:${branch}`,
{ shell: true }
);

core.debug(`Checking out "${branch}" branch locally`);
await command(`git checkout ${branch}`, { shell: true });
core.info(`Remote branch "${branch}" checked out locally.`);

core.debug(
`Rebasing "${branch}" locally using "git rebase -Xtheirs --autostash -"`
);
await command(`git rebase -Xtheirs --autostash -`, { shell: true });
return true;
} catch (error) {
Expand Down

0 comments on commit f9c177e

Please sign in to comment.