Bug 1668908 - beta to release migration needs to unset EARLY_BETA_OR_EARLIER. r=releng-reviewers,jlorenzo DONTBUILD

This should help beta simulations as well as act as a safeguard in case
the update is missed during beta.

Differential Revision: https://phabricator.services.mozilla.com/D92600
This commit is contained in:
Julien Cristau 2020-10-06 13:21:30 +00:00
parent 50effb1629
commit 6d9b07261a
2 changed files with 7 additions and 1 deletions

View File

@ -318,7 +318,10 @@ merge-automation:
version-files:
- filename: "browser/config/version_display.txt"
new-suffix: ''
replacements: []
replacements:
- - build/defines.sh
- EARLY_BETA_OR_EARLIER=1
- EARLY_BETA_OR_EARLIER=
merge-old-head: true
base-tag: 'FIREFOX_RELEASE_{major_version}_BASE'
end-tag: 'FIREFOX_RELEASE_{major_version}_END'

View File

@ -12,6 +12,9 @@ config = {
],
"replacements": [
# File, from, to
('build/defines.sh',
'EARLY_BETA_OR_EARLIER=1',
'EARLY_BETA_OR_EARLIER='),
],
"vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'),