corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
.cron.yml
View File

@@ -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

4
taskcluster/config.yml
View File

@@ -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"

10
taskcluster/kinds/merge-automation/kind.yml
View File

@@ -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

2
taskcluster/test/params/mc-to-beta-merge-automation.yml
View File

@@ -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: ''

4
tools/tryselect/docs/selectors/release.rst
View File

@@ -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 <https://shipit.staging.mozilla-releng.net/new>`_\ [#shipit]_.

2
tools/tryselect/selectors/release.py
View File

@@ -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",