Attempts to fix nightly builds
parent
7c3bc3a162
commit
3f6c68cced
|
@ -17,6 +17,7 @@ import mozilla.components.service.glean.Glean
|
||||||
object AdjustHelper {
|
object AdjustHelper {
|
||||||
fun setupAdjustIfNeeded(application: FenixApplication) {
|
fun setupAdjustIfNeeded(application: FenixApplication) {
|
||||||
// RELEASE: Enable Adjust - This class has different implementations for all build types.
|
// RELEASE: Enable Adjust - This class has different implementations for all build types.
|
||||||
|
return
|
||||||
|
|
||||||
if (TextUtils.isEmpty(BuildConfig.ADJUST_TOKEN)) {
|
if (TextUtils.isEmpty(BuildConfig.ADJUST_TOKEN)) {
|
||||||
throw IllegalStateException("No adjust token defined for release build")
|
throw IllegalStateException("No adjust token defined for release build")
|
||||||
|
|
|
@ -45,7 +45,6 @@ def generate_build_task(apks, is_staging):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
sentry_secret = '{}project/mobile/fenix/sentry'.format('garbage/staging/' if is_staging else '')
|
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(
|
return taskcluster.slugId(), BUILDER.build_task(
|
||||||
name="(Fenix) Build task",
|
name="(Fenix) Build task",
|
||||||
|
@ -54,8 +53,6 @@ def generate_build_task(apks, is_staging):
|
||||||
checkout +
|
checkout +
|
||||||
' && python automation/taskcluster/helper/get-secret.py'
|
' && python automation/taskcluster/helper/get-secret.py'
|
||||||
' -s {} -k dsn -f .sentry_token'.format(sentry_secret) +
|
' -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'),
|
' && ./gradlew --no-daemon -PcrashReports=true clean test assembleGreenfieldRelease'),
|
||||||
features={
|
features={
|
||||||
"chainOfTrust": True,
|
"chainOfTrust": True,
|
||||||
|
@ -63,8 +60,7 @@ def generate_build_task(apks, is_staging):
|
||||||
},
|
},
|
||||||
artifacts=artifacts,
|
artifacts=artifacts,
|
||||||
scopes=[
|
scopes=[
|
||||||
"secrets:get:{}".format(sentry_secret),
|
"secrets:get:{}".format(sentry_secret)
|
||||||
"secrets:get:{}".format(adjust_secret)
|
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue