From 9cba1a7bb1a9fcfaaf947fd8559b02e0f55bccc4 Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Mon, 6 Aug 2018 13:51:03 -0700 Subject: [PATCH 1/3] empty commit to trigger build From db1ff5ae1da7bd34f8d926436450c53d1054661a Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Tue, 7 Aug 2018 00:50:51 -0700 Subject: [PATCH 2/3] fixes issue with unhandled error event in travis builds --- .travis.yml | 1 + gradle/scripts/ember.gradle | 6 +++--- .../datasets/containers/dataset-acl-access-test.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f3268784c..f8594ff237 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ cache: - $HOME/.gradle/wrapper/ script: +- echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p - ./gradlew check assemble - ./gradlew jacocoFullReport coveralls && ./gradlew emberCoverage - (cd wherehows-docker && ./build.sh latest) diff --git a/gradle/scripts/ember.gradle b/gradle/scripts/ember.gradle index 3c670a9e01..0940202d0d 100644 --- a/gradle/scripts/ember.gradle +++ b/gradle/scripts/ember.gradle @@ -27,18 +27,18 @@ task bowerInstall(type: NodeTask, dependsOn: yarn) { } task emberServe(type: NodeTask, dependsOn: bowerInstall) { - script = file('node_modules/ember-cli/bin/ember') + script = file('node_modules/.bin/ember') args = ['serve'] } task emberBuild(type: NodeTask, dependsOn: bowerInstall) { - script = file('node_modules/ember-cli/bin/ember') + script = file('node_modules/.bin/ember') args = ['build', '--environment', 'production'] } task emberTest(type: NodeTask, dependsOn: bowerInstall) { environment = ['COVERAGE': 'true'] - script = file('node_modules/ember-cli/bin/ember') + script = file('node_modules/.bin/ember') args = ['test', '--launch', 'Chrome'] } diff --git a/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js b/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js index a21ea0b901..d38774da8e 100644 --- a/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js +++ b/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js @@ -39,6 +39,6 @@ test('it renders', function(assert) { this.$() .text() .trim(), - '' + 'JIT ACL is not currently available for this dataset platform' ); }); From e5ced069f14abe9b74081c59ed69b85968e8a3f3 Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Tue, 7 Aug 2018 01:14:06 -0700 Subject: [PATCH 3/3] moves inotify increase to before_install step --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8594ff237..4ebd2c32b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,15 @@ before_install: - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin + - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p + + cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ script: -- echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p - ./gradlew check assemble - ./gradlew jacocoFullReport coveralls && ./gradlew emberCoverage - (cd wherehows-docker && ./build.sh latest)