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

devops: re-use firefox checkout for firefox-stable #6410

Conversation

aslushnikov
Copy link
Contributor

Every patch to Firefox should also go to firefox-stable. This patch
starts re-using Firefox-beta checkout for firefox-stable, making
possible to easily rebaseline work atop of firefox-stable.

With this patch, working on a patch in Firefox is a 2-step
process:

  1. work on a patch against Firefox-Beta
  2. rebaseline your work atop of Firefox-Stable

Working on Firefox-Beta is as usual:

  • setup an up-to-date firefox checkout:
    $ ./browser_patches/prepare_checkout.sh firefox
  • create a new branch for your firefox work off playwright-build:
    $ cd ./browser_patches/firefox/checkout
    $ git checkout -b my-feature
  • once work is done, export your branch:
    $ ./browser_patches/export.sh firefox

Rebaselining your work for Firefox-Stable takes advantage of a single
checkout:

  • prepare a firefox-stable checkout:
    $ ./browser_patches/prepare_checkout.sh ff-stable
  • rebaseline your feature branch atop of stable:
    $ cd ./browser_patches/firefox/checkout
    $ git checkout my-feature
    $ git rebase -i playwright-build
  • make sure firefox-stable compiles:
    $ ./browser_patches/firefox-stable/build.sh
  • export firefox-stable:
    $ ./browser_patches/export.sh ff-stable

Every patch to Firefox should also go to firefox-stable. This patch
starts re-using Firefox-beta checkout for firefox-stable, making
possible to easily rebaseline work atop of firefox-stable.

With this patch, working on a patch in Firefox is a 2-step
process:
1. work on a patch against Firefox-Beta
2. rebaseline your work atop of Firefox-Stable

Working on Firefox-Beta is as usual:
- setup an up-to-date firefox checkout:
  ```sh
  $ ./browser_patches/prepare_checkout.sh firefox
  ```
- create a new branch for your firefox work off `playwright-build`:
  ```sh
  $ cd ./browser_patches/firefox/checkout
  $ git checkout -b my-feature
  ```
- once work is done, export your branch:
  ```sh
  $ ./browser_patches/export.sh firefox
  ```

Rebaselining your work for Firefox-Stable takes advantage of a single
checkout:
- prepare a firefox-stable checkout:
  ```sh
  $ ./browser_patches/prepare_checkout.sh ff-stable
  ```
- rebaseline your feature branch atop of stable:
  ```sh
  $ cd ./browser_patches/firefox/checkout
  $ git checkout my-feature
  $ git rebase -i playwright-build
  ```
- make sure firefox-stable compiles:
  ```sh
  $ ./browser_patches/firefox-stable/build.sh
  ```
- export firefox-stable:
  ```sh
  $ ./browser_patches/export.sh ff-stable
  ```
@aslushnikov aslushnikov merged commit 77c1020 into microsoft:master May 5, 2021
@aslushnikov aslushnikov deleted the firefox-stable-reuses-firefox-checkout branch May 5, 2021 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants