Merge pull request #119 from jason-fox/patch-2

Bump node to Node 10
ging · Dec 12, 2019 · f3a830b · f3a830b
2 parents 316027d + 93f3de6
commit f3a830b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,36 +1,15 @@
 branches:
   only:
     - master
+
+addons:
+  apt:
+    packages:
+      - build-essential
+      - python
 
 jobs:
   include:
-    - stage: test
-      name: "Unit Tests: Node 8"
-      language: node_js
-      sudo: required
-      dist: xenial
-
-      node_js:
-        - "8"
-
-      services:
-        - mysql
-
-      install:
-        - npm install
-
-      before_install:
-        - sudo mysql -e "use mysql; update user set authentication_string=password('test') where user='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-        - sudo mysql_upgrade -u root -ptest
-        - sudo service mysql restart
-        - cp test/config_test.js.template config.js
-
-      before_script:
-        - npm run lint
-
-      after_script:
-        - npm run test:coveralls
-
     - stage: test
       name: "Unit Tests: Node 10"
       language: node_js
@@ -58,6 +37,33 @@ jobs:
       after_script:
         - npm run test:coveralls
 
+#    - stage: test
+#      name: "Unit Tests: Node 12"
+#      language: node_js
+#      sudo: required
+#      dist: xenial
+#
+#      node_js:
+#        - "12"
+#
+#      services:
+#        - mysql
+#
+#      install:
+#        - npm install
+#
+#      before_install:
+#        - sudo mysql -e "use mysql; update user set authentication_string=password('test') where user='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+#        - sudo mysql_upgrade -u root -ptest
+#        - sudo service mysql restart
+#        - cp test/config_test.js.template config.js
+#
+#      before_script:
+#        - npm run lint
+#
+#      after_script:
+#        - npm run test:coveralls
+
     - stage: test
       name: "Documentation Tests"
       language: node_js
@@ -70,4 +76,4 @@ jobs:
 
       script:
         - npm run lint:md
-        - npm run lint:text
+        - npm run lint:text
diff --git a/extras/docker/Dockerfile b/extras/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=8.16.1-slim
+ARG NODE_VERSION=10.17.0-slim
 FROM node:${NODE_VERSION}
 ARG GITHUB_ACCOUNT=ging
 ARG GITHUB_REPOSITORY=fiware-idm