24
edits
Media/WebRTC/libwebrtc Update Process: Difference between revisions
Media/WebRTC/libwebrtc Update Process (view source)
Revision as of 23:24, 29 June 2023
, 29 June 2023Broke out separate "Backing out" section
(Add note to avoid xcode and git while script is running) |
(Broke out separate "Backing out" section) |
||
| Line 80: | Line 80: | ||
* While loop-ff.sh is running, in a separate terminal window it may be helpful to see the overall progress by running: | * While loop-ff.sh is running, in a separate terminal window it may be helpful to see the overall progress by running: | ||
tail -f .moz-fast-forward/logs/log-loop-ff.txt | grep loop-ff | tail -f .moz-fast-forward/logs/log-loop-ff.txt | grep loop-ff | ||
* [[libwebrtc GYP generated Java files|GYP generated Java files]] | * [[libwebrtc GYP generated Java files|GYP generated Java files]] | ||
* If you are requested to run <code>extract-for-git.py</code>, note that <code>loop-ff.sh</code> offers some information in initial vendoring that is is useful later, but not repeated in <code>verify_vendoring.sh</code>. Specifically, the tip about <code>tip::tip</code>: | * If you are requested to run <code>extract-for-git.py</code>, note that <code>loop-ff.sh</code> offers some information in initial vendoring that is is useful later, but not repeated in <code>verify_vendoring.sh</code>. Specifically, the tip about <code>tip::tip</code>: | ||
| Line 97: | Line 92: | ||
* It may not always be <code>tip::tip</code> depending on what was necessary to fix the issue (say a BUILD.gn change, followed by moz.build generation, and those moz.build files committed in a separate commit). | * It may not always be <code>tip::tip</code> depending on what was necessary to fix the issue (say a BUILD.gn change, followed by moz.build generation, and those moz.build files committed in a separate commit). | ||
* Simple changes don't require individual review, but if you'd feel better about getting reviewed, push the commit prior to elm (which will break all the builds). Then put the patch up for review. After r+, land it using Lando to elm. | * Simple changes don't require individual review, but if you'd feel better about getting reviewed, push the commit prior to elm (which will break all the builds). Then put the patch up for review. After r+, land it using Lando to elm. | ||
=== Backing out === | |||
* Stopping the loop-ff.sh manually is best done when in the <code>Test build</code> phase using Ctrl-c. | |||
* If a particularly complicated rebase conflict is encountered, it is possible to start over the most recent vendoring step by resetting some state and restoring the patch stack. | |||
rm .moz-fast-forward/*.resume # resets the resume logic in loop-ff.sh | |||
hg revert third_party/libwebrtc && hg purge third_party/libwebrtc | |||
./mach python dom/media/webrtc/third_party_build/restore_patch_stack.py --repo-path .moz-fast-forward/moz-libwebrtc | |||