Update .gecko_rev.yml to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE
authorPatrick Cloke <clokep@gmail.com>
Mon, 02 Sep 2019 16:15:31 -0400
changeset 36195 cffa8a9bdd8ec6616493a483b3818f4890d7f985
parent 36194 9e7982765f92ed4e9597f93467e39d68237fe543
child 36196 f9f5981ef6cea7d98757624c384d8bf08b1fb227
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersreleasemerge
Update .gecko_rev.yml to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE
.gecko_rev.yml
mail/config/version_display.txt
mail/confvars.sh
--- a/.gecko_rev.yml
+++ b/.gecko_rev.yml
@@ -1,11 +1,11 @@
 ---
 GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
-GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-beta
+GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-release
 GECKO_HEAD_REF: default
 GECKO_HEAD_REV: 91c666707c219c5215117da97cbbec3bf07f42e1
 
 ### For comm-central
 # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
 # GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/mozilla-central
 # GECKO_HEAD_REF: default
 #
--- a/mail/config/version_display.txt
+++ b/mail/config/version_display.txt
@@ -1,1 +1,1 @@
-69.0b5
+69.0
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -17,19 +17,19 @@ BROWSER_CHROME_URL=chrome://messenger/co
 
 MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-beta,thunderbird-comm-release
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-beta
+MAR_CHANNEL_ID=thunderbird-comm-release
 MOZ_PROFILE_MIGRATOR=1
 MOZ_BINARY_EXTENSIONS=1
 MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_DEVTOOLS=all