blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Attempts to fix nightly builds

master
Jeff Boek 2019-03-04 16:30:16 -08:00
parent 7c3bc3a162
commit 3f6c68cced
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/release/java/org/mozilla/fenix/AdjustHelper.kt
View File

@ -17,6 +17,7 @@ import mozilla.components.service.glean.Glean
object AdjustHelper {
fun setupAdjustIfNeeded(application: FenixApplication) {
// RELEASE: Enable Adjust - This class has different implementations for all build types.
return
if (TextUtils.isEmpty(BuildConfig.ADJUST_TOKEN)) {
throw IllegalStateException("No adjust token defined for release build")

6
automation/taskcluster/decision_task_nightly.py
View File

@ -45,7 +45,6 @@ def generate_build_task(apks, is_staging):
)
)
sentry_secret = '{}project/mobile/fenix/sentry'.format('garbage/staging/' if is_staging else '')
adjust_secret = '{}project/mobile/fenix/adjust'.format('garbage/staging/' if is_staging else '')
return taskcluster.slugId(), BUILDER.build_task(
name="(Fenix) Build task",
@ -54,8 +53,6 @@ def generate_build_task(apks, is_staging):
checkout +
' && python automation/taskcluster/helper/get-secret.py'
' -s {} -k dsn -f .sentry_token'.format(sentry_secret) +
' && python automation/taskcluster/helper/get-secret.py'
'-s {} -k Greenfield -f .adjust_token'.format(adjust_secret) +
' && ./gradlew --no-daemon -PcrashReports=true clean test assembleGreenfieldRelease'),
features={
"chainOfTrust": True,
@ -63,8 +60,7 @@ def generate_build_task(apks, is_staging):
},
artifacts=artifacts,
scopes=[
"secrets:get:{}".format(sentry_secret),
"secrets:get:{}".format(adjust_secret)
"secrets:get:{}".format(sentry_secret)
]
)