670005 - push developer.mozilla.org 0.9.7.1

Status: VERIFIED FIXED

(Infrastructure & Operations Graveyard :: WebOps: Other, task)

Description

[Luke Crouch [:groovecoder]]

http://etherpad.mozilla.org:9000/G4nmwLXbpb

Comment 1

[Jay Patel [:jay]]

Les:  Can you confirm that all your work for the June derby sub-page is complete and hand-pick the changes we need to push to production?   If you can sign-off on your changes, we can coordinate a time tomorrow to work with IT to get this out there.

Once we go live, i will be flagging the finalists and will be sharing this new page with our expert judges and the devengage/webdev teams for final voting.

I would like to shoot for a 2pm PT push tomorrow 7/8.

Comment 2

[Les Orchard [:lorchard]]

Should be all set... just checked in the last tweak to get dates into dev derby URLs. As long as that works on staging, I can merge to mdn_prod tomorrow

Comment 3

[Luke Crouch [:groovecoder]]

Les, you might want to cherry-pick commits into mdn_prod. :( I've been committing l10n and calendar work into mdn branch already ... sorry.

Comment 4

[Les Orchard [:lorchard]]

(In reply to comment #3)
> Les, you might want to cherry-pick commits into mdn_prod. :( I've been
> committing l10n and calendar work into mdn branch already ... sorry.

There are probably a dozen or so commits that need to get merged between craigcook and I... I'm not sure which ones need to go and don't, outside his and mine.

Can you get together which ones need to be left out? Or just leave out all of your commits since the last release?

Comment 5

[Luke Crouch [:groovecoder]]

Yeah, leave out all my commits from mdn.

Comment 6

[Les Orchard [:lorchard]]

Merged to mdn_prod:

https://github.com/mozilla/kuma/commit/7373f7eec1d811e3f5c93494e8c8706114b18210

For future reference, this is what I ended up doing:

git co mdn;
git co -b mdn-0.9.7.1
git rebase -i HEAD~20
# Delete the lines corresponding to non-release commits in vim
git co mdn_prod
git merge mdn-0.9.7.1
git branch -d mdn-0.9.7.1

This makes me think that we might want to look at something like Git Flow in the future. It introduces more branches into git, which might be more confusing at first. But, it isolates potentially overlapping activity into separate feature and release branches

Comment 7

[Les Orchard [:lorchard]]

Oh, and just to follow up on that last comment: I think 0.9.7.1 is good for a push by IT, unless someone finds further issues.

Comment 8

[Shyam Mani [:fox2mike]]

We pushed this out earlier. All done, thanks jake!

Comment 9

[raymond [:retornam] (inactive)]

https://developer.mozilla.org/en-US/demos/devderby/tag/challenge:2011:june/