Bug 1546322 - Modify merge scripts to not modify Fennec mozconfigs anymore r=sfraser
authorJohan Lorenzo <jlorenzo@mozilla.com>
Wed, 29 May 2019 14:35:32 +0000
changeset 476345 7613b6467c73488fe3f23e8ba1b527e75e61339c
parent 476344 ad895c9bac527615763ac1bab5d3afee732d0bab
child 476346 8f6b95ca75d779cbc094955fce11200c51537331
push id36092
push userarchaeopteryx@coole-files.de
push dateFri, 31 May 2019 17:03:46 +0000
treeherdermozilla-central@8384972e1f6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfraser
bugs1546322
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546322 - Modify merge scripts to not modify Fennec mozconfigs anymore r=sfraser Differential Revision: https://phabricator.services.mozilla.com/D33014
testing/mozharness/configs/merge_day/beta_to_release.py
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -7,26 +7,16 @@ config = {
     "copy_files": [
         {
             "src": "browser/config/version.txt",
             "dst": "browser/config/version_display.txt",
         },
     ],
     "replacements": [
         # File, from, to
-        ("{}{}".format(d, f),
-        "ac_add_options --with-branding=mobile/android/branding/beta",
-        "ac_add_options --with-branding=mobile/android/branding/official")
-        for d in ["mobile/android/config/mozconfigs/android-aarch64/",
-                  "mobile/android/config/mozconfigs/android-api-16/",
-                  "mobile/android/config/mozconfigs/android-x86/",
-                  "mobile/android/config/mozconfigs/android-x86_64/"]
-        for f in ["debug", "nightly"]
-    ] + [
-        # File, from, to
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release"),
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-beta",
          "MAR_CHANNEL_ID=firefox-mozilla-release"),
     ],