From 8cb461808193cf3be15467e96705b07a9ef1f8d7 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Tue, 27 Oct 2020 17:00:01 -0700 Subject: [PATCH] For #15707 - post: add lint test dependencies to android-gradle-dependencies script. `assemble` doesn't assemble the tests so we need to run `test`. `testClasses` isn't good enough because, according to `--profile`, it doesn't include dependencies for `testRuntimeClasspath`. --- taskcluster/scripts/toolchain/android-gradle-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh index 34ddd0276..06c23c34a 100755 --- a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh +++ b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh @@ -21,10 +21,10 @@ pushd $PROJECT_DIR NEXUS_PREFIX='http://localhost:8081/nexus/content/repositories' GRADLE_ARGS="--parallel -PgoogleRepo=$NEXUS_PREFIX/google/ -PjcenterRepo=$NEXUS_PREFIX/jcenter/" # We build everything to be sure to fetch all dependencies -./gradlew $GRADLE_ARGS assemble assembleAndroidTest ktlint detekt +./gradlew $GRADLE_ARGS assemble assembleAndroidTest testClasses ktlint detekt # Some tests may be flaky, although they still download dependencies. So we let the following # command fail, if needed. -set +e; ./gradlew $GRADLE_ARGS -Pcoverage test; set -e +set +e; ./gradlew $GRADLE_ARGS -Pcoverage test mozilla-detekt-rules:test mozilla-lint-rules:test; set -e # ./gradlew lint is missing because of https://github.com/mozilla-mobile/fenix/issues/10439. So far,