Merge branch 'beta' of github.com:mozilla/gecko-dev into gecko68

.cargo/config.in

@@ -24,7 +24,7 @@ replace-with = "vendored-sources"
 
 [source."https://github.com/CraneStation/Cranelift"]
 git = "https://github.com/CraneStation/Cranelift"
-rev = "538a0662bf90a1daa9921c10f34827ace134abf1"
+rev = "cc216b46b35a797d03c0f3e8b16a2096f1c6db61"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]

.eslintignore

@@ -101,12 +101,41 @@ devtools/shared/tests/mochitest/*.html
 devtools/shared/webconsole/test/test_*.html
 devtools/client/webreplay/mochitest/examples/*.html
 
-# Soon to be removed, the new/ directory is explicitly excluded below due to
-# also being an imported repository.
-devtools/client/debugger/**
+# Ignore devtools debugger files
+# Keep in sync with devtools/client/debugger/.eslintignore
+devtools/client/debugger/assets/*
+devtools/client/debugger/src/test/examples/**
+devtools/client/debugger/src/test/integration/**
+devtools/client/debugger/src/test/unit-sources/**
+devtools/client/debugger/src/**/fixtures/**
+devtools/client/debugger/src/test/mochitest/**
+devtools/client/debugger/bin/
+devtools/client/debugger/packages/**/fixtures/**
+devtools/client/debugger/node_modules
+devtools/client/debugger/out
+
+# Ignore devtools debugger files
+# Keep in sync with devtools/client/debugger/.prettierignore
+devtools/client/debugger/src/workers/parser/tests/fixtures/functionNames.js
+devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/*.js
+devtools/client/debugger/src/workers/parser/tests/fixtures/pause/*.js
+devtools/client/debugger/src/test/mochitest/examples/babel/polyfill-bundle.js
+devtools/client/debugger/src/test/mochitest/examples/babel/fixtures/*/input.js
+devtools/client/debugger/src/test/mochitest/examples/babel/fixtures/*/output.js
+devtools/client/debugger/src/test/mochitest/examples/babel/fixtures/*/output.js.map
+devtools/client/debugger/src/test/mochitest/examples/ember/quickstart
+
+# Ignore devtools debugger files which aren't intended for linting, and also
+# aren't included in any .eslintignore or .prettierignore file.
+# See https://github.com/firefox-devtools/debugger/blob/master/package.json#L24
+devtools/client/debugger/configs/**
+devtools/client/debugger/dist/**
+devtools/client/debugger/flow-typed/**
+devtools/client/debugger/images/**
+devtools/client/debugger/test/**
+devtools/client/debugger/index.html
 
 # Ignore devtools imported repositories
-devtools/client/debugger/**
 devtools/client/shared/components/reps/**
 
 # Ignore devtools preferences files

.gitignore

@@ -44,6 +44,12 @@ security/manager/.nss.checkout
 # gecko.log is generated by various test harnesses
 /gecko.log
 
+# Ignore newtab component build assets
+browser/components/newtab/bin/prerender.js
+browser/components/newtab/bin/prerender.js.map
+browser/components/newtab/data/locales.json
+browser/components/newtab/logs/
+
 # Build directories for js shell
 *_DBG.OBJ/
 *_OPT.OBJ/

.hgignore

@@ -39,6 +39,12 @@ compile_commands\.json
 # gecko.log is generated by various test harnesses
 ^gecko\.log
 
+# Ignore newtab component build assets
+^browser/components/newtab/bin/prerender.js
+^browser/components/newtab/bin/prerender.js.map
+^browser/components/newtab/data/locales.json
+^browser/components/newtab/logs/
+
 # Build directories for js shell
 _DBG\.OBJ/
 _OPT\.OBJ/
@@ -129,8 +135,9 @@ _OPT\.OBJ/
 # Ignore tox generated dir
 .tox/
 
-# Ignore ESLint node_modules
+# Ignore ESLint and other tool's node_modules.
 ^node_modules/
+^tools/browsertime/node_modules/
 ^tools/lint/eslint/eslint-plugin-mozilla/node_modules/
 
 # Ignore talos virtualenv and tp5n files.

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}

.taskcluster.yml

@@ -45,6 +45,7 @@
 #     taskGroupId, // targetted taskGroupId
 #     action: {name, title, description, taskGroupId, symbol, repo_scope, cb_name}
 #     ownTaskId:   // taskId of the task that will be created
+#     clientId:    // clientId that triggered this hook
 #   }
 
 version: 1
@@ -58,6 +59,11 @@ tasks:
         ownerEmail: {$if: '"@" in push.owner', then: '${push.owner}', else: '${push.owner}@noreply.mozilla.org'}
         # ensure there's no trailing `/` on the repo URL
         repoUrl: {$if: 'repository.url[-1] == "/"', then: {$eval: 'repository.url[:-1]'}, else: {$eval: 'repository.url'}}
+        # expire try earlier than other branches
+        expires:
+          $if: 'repository.project == "try"'
+          then: {$fromNow: '28 days'}
+          else: {$fromNow: '1 year'}
       in:
         taskId: {$if: 'tasks_for != "action"', then: '${ownTaskId}'}
         taskGroupId:
@@ -70,7 +76,7 @@ tasks:
 
         created: {$fromNow: ''}
         deadline: {$fromNow: '1 day'}
-        expires: {$fromNow: '1 year 1 second'} # 1 second so artifacts expire first, despite rounding errors
+        expires: {$eval: 'expires'}
         metadata:
           $merge:
             - owner: "${ownerEmail}"
@@ -130,8 +136,6 @@ tasks:
               else:
                 $if: 'tasks_for == "action"'
                 then:
-                - "notify.email.taskcluster-notifications+action-task@mozilla.com.on-failed"
-                - "notify.email.taskcluster-notifications+action-task@mozilla.com.on-exception"
                 - "index.gecko.v2.${repository.project}.pushlog-id.${push.pushlog_id}.actions.${ownTaskId}"
                 else:  # cron
                 - "index.gecko.v2.${repository.project}.latest.taskgraph.decision-${cron.job_name}"
@@ -254,7 +258,7 @@ tasks:
             'public':
               type: 'directory'
               path: '/builds/worker/artifacts'
-              expires: {$fromNow: '1 year'}
+              expires: {$eval: expires}
 
         extra:
           $merge:

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1533481 - Update to ICU 64 requires clobber
+Merge day clobber