Skip to content

Instantly share code, notes, and snippets.

@jaredhirsch
Last active April 10, 2017 22:51
Show Gist options
  • Save jaredhirsch/0b2fd6f2e6d5c2f4c2dfa51e7eeadc71 to your computer and use it in GitHub Desktop.
Save jaredhirsch/0b2fd6f2e6d5c2f4c2dfa51e7eeadc71 to your computer and use it in GitHub Desktop.
how to get screenshots code into git-cinnabar to push to try

I keep forgetting this and relearning how to do it.

  1. apply patch from bug

    • go to bug 1346825

    • find the build system commit (currently attachment 8855871)

    • just apply the raw diff locally to the various files (for whatever reason, I often find patch barfs on the diff)

    • commit the changes locally

  2. extract addon code from local git repo into local mozilla repo

    • make sure the local copy of Screenshots is up-to-date

    • incantation: EXPORT_MC_LOCATION=/Users/jhirsch/codez/mozilla/git-gecko make export_addon

  3. apply bug fix patches in local mozilla repo (just use the reflog to find SHAs, and cherry-pick) (these are my local git-cinnabar SHAs, and don't correspond to the hg commits)

    • 4ff930911f (context menu test fix)

    • 8512525b52 (CUI defaults list)

    • 5129cf62df (linter fix)

    • d3030c5483 (fix CUI defaults order)

  4. push to try via ./mach try -b o -p linux64,macosx64,win64 -u mochitest-bc -t none for BC tests, or -u all to run all the tests (including dom tests, which have been re-breaking lately)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment