mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 04:05:32 +00:00
Bug 1322041 - Add changes necessary for tc-nightly to m-c files. r=jlund
This patch takes the differences between the m-c config files and date, and applies them to m-c, in a way which shouldn't break Buildbot nightlies. MozReview-Commit-ID: Is5B3KxWNSo --HG-- extra : rebase_source : 4513e8bacd8b32f5039c6206027ce7a44a736bde extra : intermediate-source : eb425bda9f3f04734a3d2880bb52174ed344b418 extra : source : 1b4f4248cda6efda8150231d6a963c6b3d4249bc
This commit is contained in:
parent
fccb72bb33
commit
e0f41ae6f1
@ -1,9 +1,9 @@
|
||||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-central",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/",
|
||||
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
|
||||
"update_channel": "nightly",
|
||||
"latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n',
|
||||
"latest_mar_dir": '/pub/firefox/nightly/latest-mozilla-central-l10n',
|
||||
|
||||
# l10n
|
||||
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
|
||||
|
@ -1,3 +1,5 @@
|
||||
import os
|
||||
|
||||
BRANCH = "mozilla-central"
|
||||
MOZ_UPDATE_CHANNEL = "nightly"
|
||||
MOZILLA_DIR = BRANCH
|
||||
@ -27,17 +29,19 @@ config = {
|
||||
'tooltool.py': '/builds/tooltool.py',
|
||||
},
|
||||
"repos": [{
|
||||
"repo": "https://hg.mozilla.org/mozilla-central",
|
||||
"vcs": "hg",
|
||||
"repo": "https://hg.mozilla.org/build/tools",
|
||||
"branch": "default",
|
||||
"dest": "tools",
|
||||
}, {
|
||||
"vcs": "hg",
|
||||
"repo": "https://hg.mozilla.org/mozilla-central",
|
||||
"revision": "%(revision)s",
|
||||
"dest": MOZILLA_DIR,
|
||||
}, {
|
||||
"repo": "https://hg.mozilla.org/build/buildbot-configs",
|
||||
"branch": "default",
|
||||
"dest": "buildbot-configs"
|
||||
}, {
|
||||
"repo": "https://hg.mozilla.org/build/tools",
|
||||
"branch": "default",
|
||||
"dest": "tools"
|
||||
}],
|
||||
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
|
||||
"hg_l10n_tag": "default",
|
||||
@ -48,7 +52,7 @@ config = {
|
||||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"EN_US_BINARY_URL": EN_US_BINARY_URL,
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user