Skip to content
This repository has been archived by the owner on Jan 12, 2023. It is now read-only.

Commit

Permalink
Do not use gradle daemon in automation.
Browse files Browse the repository at this point in the history
  • Loading branch information
pocmo committed Mar 1, 2018
1 parent a745d85 commit 23ce616
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tasks:
&& git config advice.detachedHead false
&& git checkout {{event.head.sha}}
&& echo "--" > .adjust_token
&& ./gradlew clean assemble detektCheck ktlint lint pmd checkstyle findbugs test
&& ./gradlew --no-daemon clean assemble detektCheck ktlint lint pmd checkstyle findbugs test
artifacts:
'public':
type: 'directory'
Expand Down Expand Up @@ -123,7 +123,7 @@ tasks:
&& git checkout {{ event.version }}
&& python tools/taskcluster/get-adjust-token.py
&& python tools/l10n/filter-release-translations.py
&& ./gradlew clean test assembleRelease
&& ./gradlew --no-daemon clean test assembleRelease
artifacts:
'public':
type: 'directory'
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ before_install:
- yes | sdkmanager "platforms;android-27"

script:
- ./gradlew clean assemble
- ./gradlew --no-daemon clean assemble
- echo "--" > .adjust_token
- ./gradlew jacocoTestReport
- ./gradlew --no-daemon jacocoTestReport

after_success:
- python <(curl -s https://raw.githubusercontent.com/TouK/sputnik-ci/master/sputnik-ci.py)
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ RUN git clone https://github.com/mozilla-mobile/focus-android.git

# Build project and run gradle tasks once to pull all dependencies
WORKDIR /opt/focus-android
RUN ./gradlew assemble testFocusWebviewDebugUnitTest lint pmd checkstyle findbugs detektCheck ktlint
RUN ./gradlew --no-daemon assemble testFocusWebviewDebugUnitTest lint pmd checkstyle findbugs detektCheck ktlint

# -- Post setup -------------------------------------------------------------------------

Expand Down
10 changes: 5 additions & 5 deletions tools/taskcluster/schedule-master-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ def generate_build_task():
description = "Build Focus/Klar for Android from source code.",
command = ('echo "--" > .adjust_token'
' && python tools/l10n/check_translations.py'
' && ./gradlew clean assemble'))
' && ./gradlew --no-daemon clean assemble'))


def generate_unit_test_task(buildTaskId):
return taskcluster.slugId(), generate_task(
name = "(Focus for Android) Unit tests",
description = "Run unit tests for Focus/Klar for Android.",
command = 'echo "--" > .adjust_token && ./gradlew clean test',
command = 'echo "--" > .adjust_token && ./gradlew --no-daemon clean test',
dependencies = [ buildTaskId ])


def generate_code_quality_task(buildTaskId):
return taskcluster.slugId(), generate_task(
name = "(Focus for Android) Code quality",
description = "Run code quality tools on Focus/Klar for Android code base.",
command = 'echo "--" > .adjust_token && ./gradlew clean detektCheck ktlint lint pmd checkstyle findbugs',
command = 'echo "--" > .adjust_token && ./gradlew --no-daemon clean detektCheck ktlint lint pmd checkstyle findbugs',
dependencies = [ buildTaskId ])


Expand All @@ -50,7 +50,7 @@ def generate_ui_test_task(dependencies):
name = "(Focus for Android) UI tests",
description = "Run UI tests for Focus/Klar for Android.",
command = ('echo "--" > .adjust_token'
' && ./gradlew clean assembleFocusWebviewDebug assembleFocusWebviewDebugAndroidTest'
' && ./gradlew --no-daemon clean assembleFocusWebviewDebug assembleFocusWebviewDebugAndroidTest'
' && tools/taskcluster/execute-firebase-test.sh'),
dependencies = dependencies,
scopes = [ 'secrets:get:project/focus/firebase' ],
Expand All @@ -68,7 +68,7 @@ def generate_release_task(uiTestTaskId):
name = "(Focus for Android) Preview release",
description = "Build preview versions for testing Focus/Klar for Android.",
command = ('echo "--" > .adjust_token'
' && ./gradlew clean assembleBeta'
' && ./gradlew --no-daemon clean assembleBeta'
' && python tools/taskcluster/sign-preview-builds.py'
' && touch /opt/focus-android/builds/`date +"%Y-%m-%d-%H-%M"`'
' && touch /opt/focus-android/builds/' + COMMIT),
Expand Down
2 changes: 1 addition & 1 deletion tools/taskcluster/take-screenshots.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export LC_ALL="en_US.UTF-8"
emulator64-arm -avd test -noaudio -no-window -no-accel -gpu off -verbose &

# Build and install app & test APKs (while the emulator is booting..)
./gradlew assembleFocusWebviewDebug assembleFocusWebviewDebugAndroidTest
./gradlew --no-daemon assembleFocusWebviewDebug assembleFocusWebviewDebugAndroidTest

# Start our server for running screencap on the emulator host (via HTTP)
python $directory/screencap-server.py &
Expand Down

0 comments on commit 23ce616

Please sign in to comment.