Add up to date templates for circle and travis ci.

jbelmont · Mar 11, 2017 · 783a6dc · 783a6dc
1 parent 6140009
commit 783a6dc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/docs/circle-ci/circle-ci.md b/docs/circle-ci/circle-ci.md
@@ -21,6 +21,7 @@ jobs:
   build:
     docker:
       - image: node:7.6.0
+      - image: openjdk:8
     working_directory: ~/code-craftsmanship-organization/continuous-integration-with-jenkins-travis-and-circleci
     steps:
       - checkout
@@ -35,6 +36,9 @@ jobs:
             wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | apt-key add -
             apt-get -y update -qq
             apt-get -y install rethinkdb
+      - run:
+          name: Install Latest Chrome
+          command: bash scripts/get-latest-chrome.sh
       - run:
           name: Install Dependencies
           command: npm install

diff --git a/docs/travis-ci/travis-ci.md b/docs/travis-ci/travis-ci.md
@@ -5,18 +5,30 @@
 ## Sample Travis yml script
 
 ```yml
+dist: trusty
+sudo: required
 language: node_js
 node_js:
   - 6
-sudo: required
 env:
   - NODE_ENV=test
 addons:
   rethinkdb: '2.3.5'
+  sources:
+    - google-chrome
+  apt:
+    packages:
+      - oracle-java8-installer
+      - oracle-java8-set-default
+      - google-chrome-stable
 before_script:
-  - npm run start:rethinkdb
+  - export CHROME_BIN=chromium-browser
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3
 after_success:
   - npm run coveralls
+  - npm run build && npm run e2e
 ```
 
 ## Integrate Travis CI with Github