diff --git a/.cron.yml b/.cron.yml index 1bb36f34e61e..9ba2c28c134a 100644 --- a/.cron.yml +++ b/.cron.yml @@ -48,14 +48,14 @@ jobs: when: - {weekday: "Friday", hour: 7, minute: 0} - - name: merge-central-to-beta-dry-run + - name: merge-main-to-beta-dry-run job: type: trigger-action action-name: merge-automation include-cron-input: false extra-input: force-dry-run: true - behavior: central-to-beta + behavior: main-to-beta push: true run-on-projects: - mozilla-central diff --git a/taskcluster/config.yml b/taskcluster/config.yml index 42c2ef188030..5b5d4a58a6d0 100644 --- a/taskcluster/config.yml +++ b/taskcluster/config.yml @@ -465,7 +465,7 @@ release-promotion: merge-automation: behaviors: - central-to-beta: + main-to-beta: fetch-version-from: "browser/config/version.txt" version-files: - filename: "config/milestone.txt" @@ -540,7 +540,7 @@ merge-automation: merge-old-head: false end-tag: "FIREFOX_ESR_{major_version}_BASE" to-branch: 'esr140' - bump-central: + bump-main: fetch-version-from: "browser/config/version.txt" version-files: - filename: "config/milestone.txt" diff --git a/taskcluster/kinds/merge-automation/kind.yml b/taskcluster/kinds/merge-automation/kind.yml index eb9c524a6f5d..cf8b4a095abf 100644 --- a/taskcluster/kinds/merge-automation/kind.yml +++ b/taskcluster/kinds/merge-automation/kind.yml @@ -31,24 +31,24 @@ tasks: by-project: try: by-behavior: - central-to-beta: staging-firefox-beta + main-to-beta: staging-firefox-beta early-to-late-beta: staging-firefox-beta beta-to-release: staging-firefox-release release-to-esr: staging-firefox-esr140 - bump-central: staging-firefox-main + bump-main: staging-firefox-main bump-esr140: staging-firefox-esr140 default: by-behavior: - central-to-beta: firefox-beta + main-to-beta: firefox-beta early-to-late-beta: firefox-beta beta-to-release: firefox-release release-to-esr: firefox-esr140 - bump-central: firefox-main + bump-main: firefox-main bump-esr140: firefox-esr140 dontbuild: false l10n-bump-info: by-behavior: - central-to-beta: + main-to-beta: - name: Firefox l10n changesets path: browser/locales/l10n-changesets.json l10n-repo-url: https://github.com/mozilla-l10n/firefox-l10n diff --git a/taskcluster/test/params/mc-to-beta-merge-automation.yml b/taskcluster/test/params/mc-to-beta-merge-automation.yml index f3ff842c0a1d..5a537e50f41a 100644 --- a/taskcluster/test/params/mc-to-beta-merge-automation.yml +++ b/taskcluster/test/params/mc-to-beta-merge-automation.yml @@ -23,7 +23,7 @@ head_tag: '' hg_branch: default level: '3' merge_config: - behavior: central-to-beta + behavior: main-to-beta force-dry-run: false push: true message: '' diff --git a/tools/tryselect/docs/selectors/release.rst b/tools/tryselect/docs/selectors/release.rst index 946266249bd3..239f350cbb1e 100644 --- a/tools/tryselect/docs/selectors/release.rst +++ b/tools/tryselect/docs/selectors/release.rst @@ -12,13 +12,13 @@ For staging a beta release, run the following (with an appropriate version numbe .. 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) .. 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 through `staging ship-it instance `_\ [#shipit]_. diff --git a/tools/tryselect/selectors/release.py b/tools/tryselect/selectors/release.py index 378b97963882..ebc0b567b326 100644 --- a/tools/tryselect/selectors/release.py +++ b/tools/tryselect/selectors/release.py @@ -44,7 +44,7 @@ class ReleaseParser(BaseTryParser): "action": "append", "dest": "migrations", "choices": [ - "central-to-beta", + "main-to-beta", "beta-to-release", "early-to-late-beta", "release-to-esr",