51
edits
(add a note about filing a bug for issues with the new uplift workflow) |
(add screenshots for points in the workflow) |
||
| Line 24: | Line 24: | ||
# '''Go to the Lando page for the stack of revisions to uplift.''' Note: the maximum stack size for use in the web UI is 5 patches. Please use moz-phab to submit larger patch stacks. You can get here from the Phabricator revision by using the “View stack in Lando” option on the right side menu. | # '''Go to the Lando page for the stack of revisions to uplift.''' Note: the maximum stack size for use in the web UI is 5 patches. Please use moz-phab to submit larger patch stacks. You can get here from the Phabricator revision by using the “View stack in Lando” option on the right side menu. | ||
# '''Log in to Lando.''' Click the Log In button in the top right. | # '''Log in to Lando.''' Click the Log In button in the top right. | ||
# '''Add your Phabricator API token and save changes.''' Click your username in the top right corner and paste the Phabricator API token there. Tokens are in the form ''api-XXXXX…''. This token can be found here (replace <USERNAME> with your phab username): https://phabricator.services.mozilla.com/settings/user/<USERNAME>/page/apitokens/ | # '''Add your Phabricator API token and save changes.''' Click your username in the top right corner and paste the Phabricator API token there. Tokens are in the form ''api-XXXXX…''. This token can be found here (replace <USERNAME> with your phab username): https://phabricator.services.mozilla.com/settings/user/<USERNAME>/page/apitokens/ [[File:Lando-phab-api-token.png|thumb|Click your username in the top right corner and paste the Phabricator API token there.]] | ||
# '''Click the “Preview Landing” button. There should be a new button on the bottom right of the modal that is shown.''' Select the target repo (beta) from the list and click “request uplift” | # '''Click the “Preview Landing” button. There should be a new button on the bottom right of the modal that is shown.''' Select the target repo (beta) from the list and click “request uplift”. [[File:Request-uplift-button-lando.png|thumb|Click the "Request uplift" button in the bottom right.]] | ||
# '''Complete the uplift request form. See the section below on how to submit the form.''' | # '''Complete the uplift request form. See the section below on how to submit the form.''' | ||
| Line 33: | Line 33: | ||
# '''Go to a revision in the uplift request stack.''' | # '''Go to a revision in the uplift request stack.''' | ||
# '''Navigate to the bottom of the page where you would “approve” or “request changes” for a patch and select “Change uplift request form”.''' | # '''Navigate to the bottom of the page where you would “approve” or “request changes” for a patch and select “Change uplift request form”.''' [[File:Phab-Uplift-request-form-action.png|thumb|Select "Change uplift request form".]] | ||
# '''Complete the form and press “request uplift”.''' | # '''Complete the form and press “request uplift”.''' [[File:Phab-Uplift-request-button.png|thumb|Complete the form and click "Request uplift".]] | ||
# '''Wait for Release Manager approval.''' If the patch stack does not apply cleanly to the uplift train due to a merge conflict, you may need to resolve merge conflicts and re-submit the stack. | # '''Wait for Release Manager approval.''' If the patch stack does not apply cleanly to the uplift train due to a merge conflict, you may need to resolve merge conflicts and re-submit the stack. | ||
edits