Merge pull request #13 from Oefenweb/add-10.x-support

Add 10.x support
Oefenweb · Aug 23, 2018 · 96448fb · 96448fb
2 parents 080a843 + 642121d
commit 96448fb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,12 @@ python: "2.7"
 
 env:
   - ANSIBLE_VERSION=latest
+  - ANSIBLE_VERSION=2.6.3
+  - ANSIBLE_VERSION=2.6.2
   - ANSIBLE_VERSION=2.6.1
   - ANSIBLE_VERSION=2.6.0
+  - ANSIBLE_VERSION=2.5.8
+  - ANSIBLE_VERSION=2.5.7
   - ANSIBLE_VERSION=2.5.6
   - ANSIBLE_VERSION=2.5.5
   - ANSIBLE_VERSION=2.5.4

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Set up the latest version of [Node.js](https://nodejs.org) and [npm](https://www
 
 #### Variables
 
-* `nodejs_version` [default: `nodejs-v6x`]: Version to install (e.g. `nodejs-v7x`, `nodejs-v6x`, `nodejs-v5x`, `nodejs-v012`, `nodejs-v010`, `iojs-v3x`, `iojs-v2x`, `iojs-v1x`)
+* `nodejs_version` [default: `nodejs-v6x`]: Version to install (e.g. `nodejs-v10x`, `nodejs-v9x`, `nodejs-v8x`, `nodejs-v7x`, `nodejs-v6x`, `nodejs-v5x`, `nodejs-v012`, `nodejs-v010`, `iojs-v3x`, `iojs-v2x`, `iojs-v1x`)
 
 * `nodejs_install` [default: `[build-essential]`]: Packages to install
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -26,24 +26,31 @@ boxes = [
     :cpu => "50",
     :ram => "256"
   },
+  {
+    :name => "ubuntu-1804",
+    :box => "bento/ubuntu-18.04",
+    :ip => '10.0.0.14',
+    :cpu => "50",
+    :ram => "256"
+  },
   {
     :name => "debian-7",
     :box => "bento/debian-7",
-    :ip => '10.0.0.14',
+    :ip => '10.0.0.15',
     :cpu => "50",
     :ram => "256"
   },
   {
     :name => "debian-8",
     :box => "bento/debian-8",
-    :ip => '10.0.0.15',
+    :ip => '10.0.0.16',
     :cpu => "50",
     :ram => "256"
   },
   {
     :name => "debian-9",
     :box => "bento/debian-9",
-    :ip => '10.0.0.16',
+    :ip => '10.0.0.17',
     :cpu => "50",
     :ram => "256"
   },

diff --git a/meta/main.yml b/meta/main.yml
@@ -12,6 +12,7 @@ galaxy_info:
         - precise
         - trusty
         - xenial
+        - bionic
     - name: Debian
       versions:
         - wheezy

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,6 +1,7 @@
 # vars file for nodejs
 ---
 nodejs_version_map:
+  nodejs-v10x: '10.x'
   nodejs-v9x: '9.x'
   nodejs-v8x: '8.x'
   nodejs-v7x: '7.x'
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ galaxy_info: @@
             - precise
             - trusty
             - xenial
+            - bionic
         - name: Debian
           versions:
             - wheezy
@@ Expand Down @@