From 4b746ef1c5d6b3c9a49cf9f4a8d6b8945a988db7 Mon Sep 17 00:00:00 2001 From: Justin Phillips Date: Wed, 1 Nov 2017 10:06:03 -0400 Subject: [PATCH 1/5] Add travis support --- .travis.yml | 26 ++++++++++++++++++++++++++ karma.conf.js | 7 +++++++ 2 files changed, 33 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6e89292 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +sudo: required +dist: trusty +language: node_js +node_js: + - '4.2' + +addons: +apt: + sources: + - google-chrome + packages: + - google-chrome-stable + - google-chrome-beta + +before_install: + - export CHROME_BIN=chromium-browser + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start + +before_script: +- npm install -g angular-cli +- npm install -g karma +- npm install +- ng build + +script: karma start config/karma.conf.js --single-run \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 4d9ab9d..7b94881 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -22,6 +22,13 @@ module.exports = function (config) { angularCli: { environment: 'dev' }, + customLaunchers: { + // chrome setup for travis CI using chromium + Chrome_travis_ci: { + base: 'Chrome', + flags: [' — no-sandbox'] + } + }, reporters: ['progress', 'kjhtml'], port: 9876, colors: true, From 2a19a1ce5a09cdd7f556c4fd87d703875d95c155 Mon Sep 17 00:00:00 2001 From: Justin Phillips Date: Wed, 1 Nov 2017 10:12:01 -0400 Subject: [PATCH 2/5] Added badge for master --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c2ef825..6dca5c2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # FrontEnd +![alt text](https://travis-ci.org/AITestingOrg/front-end.svg?branch=master "Build Status") This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.1.1. From 3b4414b900ddb16b4b5f181a00f0319d38dc7cb4 Mon Sep 17 00:00:00 2001 From: Justin Phillips Date: Wed, 1 Nov 2017 10:14:54 -0400 Subject: [PATCH 3/5] Upgraded Travis node version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e89292..53e20fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required dist: trusty language: node_js node_js: - - '4.2' + - '8.1' addons: apt: From 0e01c02c2741bbccc66d4a96763ddfce093e8c09 Mon Sep 17 00:00:00 2001 From: Justin Phillips Date: Wed, 1 Nov 2017 10:26:07 -0400 Subject: [PATCH 4/5] Include missing dependencies. --- package-lock.json | 21 +++++++++++++++++++++ package.json | 3 +++ 2 files changed, 24 insertions(+) diff --git a/package-lock.json b/package-lock.json index 39720ef..f716ed6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,14 @@ "tslib": "1.8.0" } }, + "@angular/cdk": { + "version": "2.0.0-beta.12", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.12.tgz", + "integrity": "sha1-OiQ8tiuT9OA5EgunD5ANyeI1Yi4=", + "requires": { + "tslib": "1.8.0" + } + }, "@angular/cli": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.1.1.tgz", @@ -143,6 +151,14 @@ "integrity": "sha1-SY7OlcX2BmQDv5/TxYMa9CtFYYs=", "dev": true }, + "@angular/material": { + "version": "2.0.0-beta.12", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.12.tgz", + "integrity": "sha1-cbbQt7AhiR5dDjaIwdS9eMdFf1g=", + "requires": { + "tslib": "1.8.0" + } + }, "@angular/platform-browser": { "version": "4.4.6", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.6.tgz", @@ -3619,6 +3635,11 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, + "hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" + }, "handle-thing": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", diff --git a/package.json b/package.json index 2d03565..f0951ef 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,18 @@ "private": true, "dependencies": { "@angular/animations": "^4.0.0", + "@angular/cdk": "^2.0.0-beta.12", "@angular/common": "^4.0.0", "@angular/compiler": "^4.0.0", "@angular/core": "^4.0.0", "@angular/forms": "^4.0.0", "@angular/http": "^4.0.0", + "@angular/material": "^2.0.0-beta.12", "@angular/platform-browser": "^4.0.0", "@angular/platform-browser-dynamic": "^4.0.0", "@angular/router": "^4.0.0", "core-js": "^2.4.1", + "hammerjs": "^2.0.8", "rxjs": "^5.1.0", "zone.js": "^0.8.4" }, From fb71b9342f5974c0e0a7692246f782263bb00d60 Mon Sep 17 00:00:00 2001 From: Justin Phillips Date: Wed, 1 Nov 2017 10:31:16 -0400 Subject: [PATCH 5/5] Fixed config path. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 53e20fa..7c9325a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,4 @@ before_script: - npm install - ng build -script: karma start config/karma.conf.js --single-run \ No newline at end of file +script: karma start ./karma.conf.js --single-run \ No newline at end of file