From ccf1337ed5043bbb5260c943d61a9e2b7fad4308 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Fri, 14 Aug 2026 11:19:42 +1000 Subject: [PATCH 1/2] Bug 2063147 - workflows: automatically retarget PRs to autoland DOT_GITHUB_OVERRIDE DONTBUILD r=tcampbell,zeid This is the most common use-case, so we make this the default. Note: due to the way the link to lando is then created based on the current target ref, the repo must be configured with a LANDO_REPO Actions variable. Differential Revision: https://phabricator.services.mozilla.com/D318376 --- .github/workflows/pr-handler.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-handler.yml b/.github/workflows/pr-handler.yml index 3aa52f0fe61cb..90767e1c8b0ed 100644 --- a/.github/workflows/pr-handler.yml +++ b/.github/workflows/pr-handler.yml @@ -86,10 +86,13 @@ jobs: gh pr lock "${PR}" - name: Check PR target - if: (steps.team.outputs.is_member == 'true' && steps.paths.outputs.only_allowed == 'true') && github.event.action == 'opened' && github.base_ref == 'main' + if: (steps.team.outputs.is_member == 'true' && steps.paths.outputs.only_allowed == 'true') && github.event.action == 'opened' && github.base_ref != 'autoland' run: | + gh pr edit "${PR}" --base "autoland" gh pr comment "${PR}" --body "> [!WARNING] - The base branch is currently set to \`main\`. Please [Edit this PR](https://docs.github.com/en/pull-requests/how-tos/create-pull-requests/changing-the-base-branch-of-a-pull-request) and set the base to \`autoland\`." + The target branch has been automatically set to \`autoland\`. + + Please [Edit this PR](https://docs.github.com/en/pull-requests/how-tos/create-pull-requests/changing-the-base-branch-of-a-pull-request) if this wasn't your intention." - name: Add Lando link if: (steps.team.outputs.is_member == 'true' && steps.paths.outputs.only_allowed == 'true') && github.event.action == 'opened' From e0a6f58d34d3ec118ec459cc1cde0284fde1baf1 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Fri, 28 Aug 2026 12:48:46 +1000 Subject: [PATCH 2/2] TEST: for Bug 2063147 --- mobile/android/fenix/TEST | 1 + 1 file changed, 1 insertion(+) create mode 100644 mobile/android/fenix/TEST diff --git a/mobile/android/fenix/TEST b/mobile/android/fenix/TEST new file mode 100644 index 0000000000000..20b078a471907 --- /dev/null +++ b/mobile/android/fenix/TEST @@ -0,0 +1 @@ +dbda038d-f5f7-4125-93c5-d968084d3ac4