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.

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

Minor tweaks to release process #1938

Merged
merged 5 commits into from Feb 6, 2019

Conversation

Projects
None yet
3 participants
@kuychaco
Copy link
Member

kuychaco commented Feb 5, 2019

I'll update this with any other tweaks I come across as I walk through the rest of the release process

Notable changes:

Removed Atom CI verification step.
Rationale: This step was originally introduced to catch snapshotting problems, but we now have other measures for catching this. Specifically we have a CI job that runs on our atom/github PRs, and we do a local build of Atom with a pre-release package version as part of our release QA testing.

Cut release branch at the start.
Rationale: So that work can continue on master without interfering with the release process.

Added steps for handling when publishing fails (make sure to delete tag and get release commit out of commit history)


View rendered docs/how-we-work.md

@codecov

This comment has been minimized.

Copy link

codecov bot commented Feb 5, 2019

Codecov Report

Merging #1938 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1938      +/-   ##
==========================================
- Coverage   92.14%   92.12%   -0.02%     
==========================================
  Files         189      189              
  Lines       10809    10809              
  Branches     1581     1581              
==========================================
- Hits         9960     9958       -2     
- Misses        849      851       +2
Impacted Files Coverage Δ
lib/atom/gutter.js 89.74% <0%> (-2.57%) ⬇️
lib/github-package.js 68.09% <0%> (-0.39%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cd23742...b58df68. Read the comment docs.

@annthurium
Copy link
Contributor

annthurium left a comment

thanks for updating the docs, Katrina!

kuychaco added some commits Feb 6, 2019

Cut release branch at the start. Cherry-pick fixes over accordingly
Previously we did the pre-release on master, which leaves room for master to move forward during QA testing. I just ran into this with the 0.25.0 release (which ended up being the 0.26.0 release due to these complications 😳).

@kuychaco kuychaco requested a review from smashwilson Feb 6, 2019

@smashwilson
Copy link
Member

smashwilson left a comment

We should ✂️ the second "release branch creation" step. Other than that 💯

1. Check if a release commit was created (`git log`). If one exists, remove it from the commit history (`git reset --hard <sha-prior-to-commit>`).
1. Check if a release tag was created (`git tag`). If one exists, delete it (`git tag -d 0.${MINOR}.0`).
1. Address the problem that interfered with publishing.
1. Try to publish again with `apm publish minor`.
9. _In your atom/github repository:_ create a release branch for this minor version with `git checkout -b 0.${MINOR}-releases`. Push it to atom/github.

This comment has been minimized.

@smashwilson

smashwilson Feb 6, 2019

Member

This step should be deleted now, yeah?

9. _In your atom/github repository:_ create a release branch for this minor version with `git checkout -b 0.${MINOR}-releases`. Push it to atom/github.
9. _In your atom/atom repository:_ update the version of the `"github"` entry beneath `packageDependencies` in `package.json` to match the published minor version. Run `script/build` to update `package-lock.json` files. Commit and push these changes.
9. _In your atom/atom repository:_ checkout a new branch (`git checkout -b bump-github-${VERSION}`), update the version of the `"github"` entry beneath `packageDependencies` in `package.json` to match the published minor version. Run `script/build` to update `package-lock.json` files. Commit and push these changes.

This comment has been minimized.

@smashwilson

smashwilson Feb 6, 2019

Member

Sidenote: you can get away with just running script/bootstrap instead of script/build. But script/build is safer because it actually runs through the final snapshotting and everything, so let's leave it like this.

@kuychaco kuychaco requested a review from smashwilson Feb 6, 2019

@kuychaco kuychaco merged commit d846182 into master Feb 6, 2019

@kuychaco kuychaco deleted the kuychaco-patch-1 branch Feb 6, 2019

@vanessayuenn vanessayuenn referenced this pull request Mar 6, 2019

Closed

v0.27.0-0 QA Review #2005

7 of 9 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.