Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollback Git operations when publish fails and on termination #334

Merged
merged 15 commits into from
Mar 31, 2019
Merged

Rollback Git operations when publish fails and on termination #334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1d51e51
Rollback when publish fails and on SIGINT
itaisteinherz Jan 20, 2019
b6b0020
Update index.js
sindresorhus Jan 22, 2019
3a1bd27
Review improvements
itaisteinherz Jan 22, 2019
cc57b69
Move Git commands to `git-util.js`
itaisteinherz Jan 27, 2019
6611ee0
Avoid returning unused values
itaisteinherz Jan 27, 2019
09ee92b
Return Observable on publish
itaisteinherz Feb 14, 2019
855e366
Fix publish task
itaisteinherz Feb 15, 2019
f7a83bd
Catch process SIGINT event using `async-exit-hook`
itaisteinherz Feb 20, 2019
1e1f12a
Merge branch 'master' into rollback-on-publish-fail
itaisteinherz Feb 21, 2019
aae3a7e
Fix rollback after publishing failed
itaisteinherz Feb 22, 2019
061e5c9
Review improvements
itaisteinherz Feb 23, 2019
07adf91
Merge branch 'master' into rollback-on-publish-fail
itaisteinherz Feb 23, 2019
dd540e3
Fix exit event handling
itaisteinherz Feb 28, 2019
0ed1047
Fix rollback when using npm
itaisteinherz Mar 15, 2019
e8e90fe
Mention feature in the readme
itaisteinherz Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions source/git-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,9 @@ exports.verifyTagDoesNotExistOnRemote = async tagName => {
exports.commitLogFromRevision = revision => execa.stdout('git', ['log', '--format=%s %h', `${revision}..HEAD`]);

exports.push = () => execa('git', ['push', '--follow-tags']);

exports.getLastCommit = () => execa.stdout('git', ['log', '--max-count=1', '--pretty=%B']);

exports.deleteTag = tagName => execa('git', ['tag', '--delete', tagName]);
itaisteinherz marked this conversation as resolved.
Show resolved Hide resolved

exports.removeLastCommit = () => execa('git', ['reset', '--hard', 'HEAD~1']);
8 changes: 4 additions & 4 deletions source/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ module.exports = async (input = 'patch', options) => {
const rollback = onetime(async () => {
itaisteinherz marked this conversation as resolved.
Show resolved Hide resolved
console.log('\nPublish failed. Rolling back to the previous state…');

const lastCommit = await execa.stdout('git', ['log', 'HEAD^..HEAD', '--pretty=%B']);
const lastCommit = await git.getLastCommit();
try {
if (lastCommit === util.readPkg().version && lastCommit !== pkg.version) {
await execa('git', ['tag', '--delete', options.version]);
await execa('git', ['reset', '--hard', 'HEAD~1']);
if (lastCommit === util.readPkg().version && lastCommit !== pkg.version) { // Verify that the package's version has been bumped before deleting the last tag and commit.
await git.deleteTag(options.version);
await git.removeLastCommit();
}

console.log('Successfully rolled back the project to its previous state.');
Expand Down