blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1297 - Re-adds adjust to build task

master
Jeff Boek 2019-04-17 13:42:46 -07:00
parent f848ed149a
commit 5d04669854
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/components/Analytics.kt
View File

@ -15,6 +15,7 @@ import mozilla.components.lib.crash.service.SentryService
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.AdjustMetricsService
import org.mozilla.fenix.components.metrics.GleanMetricsService
import org.mozilla.fenix.components.metrics.LeanplumMetricsService
import org.mozilla.fenix.components.metrics.MetricController
@ -72,7 +73,8 @@ class Analytics(
MetricController.create(
listOf(
GleanMetricsService(context),
LeanplumMetricsService(context as Application)
LeanplumMetricsService(context as Application),
AdjustMetricsService(context)
),
isTelemetryEnabled = { Settings.getInstance(context).isTelemetryEnabled }
)

6
automation/taskcluster/lib/tasks.py
View File

@ -56,6 +56,9 @@ class TaskBuilder(object):
leanplum_secret = '{}project/mobile/fenix/leanplum'.format(
'garbage/staging/' if is_staging else ''
)
adjust_secret = '{}project/mobile/fenix/adjust'.format(
'garbage/staging/' if is_staging else ''
)
pre_gradle_commands = (
'python automation/taskcluster/helper/get-secret.py -s {} -k {} -f {}'.format(
@ -64,6 +67,7 @@ class TaskBuilder(object):
for secret, key, target_file in (
(sentry_secret, 'dsn', '.sentry_token'),
(leanplum_secret, 'production', '.leanplum_token'),
(adjust_secret, 'Greenfield', '.adjust_token'),
)
)
@ -87,7 +91,7 @@ class TaskBuilder(object):
description='Build Fenix from source code',
command=command,
scopes=[
"secrets:get:{}".format(secret) for secret in (sentry_secret, leanplum_secret)
"secrets:get:{}".format(secret) for secret in (sentry_secret, leanplum_secret, adjust_secret)
],
artifacts=artifacts,
routes=routes,