Bug 1967638: rename 'central' in merge-automation actions to 'main' r=releng-reviewers,jcristau

Differential Revision: https://phabricator.services.mozilla.com/D250380
This commit is contained in:
Ben Hearsum
2025-05-21 15:02:39 +00:00
committed by bhearsum@mozilla.com
parent 06881b18db
commit b18d805c6e
6 changed files with 13 additions and 13 deletions

View File

@@ -48,14 +48,14 @@ jobs:
when: when:
- {weekday: "Friday", hour: 7, minute: 0} - {weekday: "Friday", hour: 7, minute: 0}
- name: merge-central-to-beta-dry-run - name: merge-main-to-beta-dry-run
job: job:
type: trigger-action type: trigger-action
action-name: merge-automation action-name: merge-automation
include-cron-input: false include-cron-input: false
extra-input: extra-input:
force-dry-run: true force-dry-run: true
behavior: central-to-beta behavior: main-to-beta
push: true push: true
run-on-projects: run-on-projects:
- mozilla-central - mozilla-central

View File

@@ -465,7 +465,7 @@ release-promotion:
merge-automation: merge-automation:
behaviors: behaviors:
central-to-beta: main-to-beta:
fetch-version-from: "browser/config/version.txt" fetch-version-from: "browser/config/version.txt"
version-files: version-files:
- filename: "config/milestone.txt" - filename: "config/milestone.txt"
@@ -540,7 +540,7 @@ merge-automation:
merge-old-head: false merge-old-head: false
end-tag: "FIREFOX_ESR_{major_version}_BASE" end-tag: "FIREFOX_ESR_{major_version}_BASE"
to-branch: 'esr140' to-branch: 'esr140'
bump-central: bump-main:
fetch-version-from: "browser/config/version.txt" fetch-version-from: "browser/config/version.txt"
version-files: version-files:
- filename: "config/milestone.txt" - filename: "config/milestone.txt"

View File

@@ -31,24 +31,24 @@ tasks:
by-project: by-project:
try: try:
by-behavior: by-behavior:
central-to-beta: staging-firefox-beta main-to-beta: staging-firefox-beta
early-to-late-beta: staging-firefox-beta early-to-late-beta: staging-firefox-beta
beta-to-release: staging-firefox-release beta-to-release: staging-firefox-release
release-to-esr: staging-firefox-esr140 release-to-esr: staging-firefox-esr140
bump-central: staging-firefox-main bump-main: staging-firefox-main
bump-esr140: staging-firefox-esr140 bump-esr140: staging-firefox-esr140
default: default:
by-behavior: by-behavior:
central-to-beta: firefox-beta main-to-beta: firefox-beta
early-to-late-beta: firefox-beta early-to-late-beta: firefox-beta
beta-to-release: firefox-release beta-to-release: firefox-release
release-to-esr: firefox-esr140 release-to-esr: firefox-esr140
bump-central: firefox-main bump-main: firefox-main
bump-esr140: firefox-esr140 bump-esr140: firefox-esr140
dontbuild: false dontbuild: false
l10n-bump-info: l10n-bump-info:
by-behavior: by-behavior:
central-to-beta: main-to-beta:
- name: Firefox l10n changesets - name: Firefox l10n changesets
path: browser/locales/l10n-changesets.json path: browser/locales/l10n-changesets.json
l10n-repo-url: https://github.com/mozilla-l10n/firefox-l10n l10n-repo-url: https://github.com/mozilla-l10n/firefox-l10n

View File

@@ -23,7 +23,7 @@ head_tag: ''
hg_branch: default hg_branch: default
level: '3' level: '3'
merge_config: merge_config:
behavior: central-to-beta behavior: main-to-beta
force-dry-run: false force-dry-run: false
push: true push: true
message: '' message: ''

View File

@@ -12,13 +12,13 @@ For staging a beta release, run the following (with an appropriate version numbe
.. code-block:: shell .. code-block:: shell
$ mach try release --version 64.0b5 --migration central-to-beta $ mach try release --version 64.0b5 --migration main-to-beta
For staging a final release (rc or patch), run the following (with an appropriate version number) For staging a final release (rc or patch), run the following (with an appropriate version number)
.. code-block:: shell .. code-block:: shell
$ mach try release --version 64.0 --migration central-to-beta --migration beta-to-release $ mach try release --version 64.0 --migration main-to-beta --migration beta-to-release
Once the decision task is on the push is complete, you can start the release Once the decision task is on the push is complete, you can start the release
through `staging ship-it instance <https://shipit.staging.mozilla-releng.net/new>`_\ [#shipit]_. through `staging ship-it instance <https://shipit.staging.mozilla-releng.net/new>`_\ [#shipit]_.

View File

@@ -44,7 +44,7 @@ class ReleaseParser(BaseTryParser):
"action": "append", "action": "append",
"dest": "migrations", "dest": "migrations",
"choices": [ "choices": [
"central-to-beta", "main-to-beta",
"beta-to-release", "beta-to-release",
"early-to-late-beta", "early-to-late-beta",
"release-to-esr", "release-to-esr",