diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc43ab5..70e6297 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,11 +47,11 @@ jobs: - distro: debian10 - distro: debian11 - distro: debian12 - - distro: ubuntu1604 - ansible-version: '>=2.10, <2.11' - - distro: ubuntu1604 - distro: ubuntu1804 + ansible-version: '>=9, <10' - distro: ubuntu2004 + - distro: ubuntu2204 + - distro: ubuntu2404 steps: - name: Check out the codebase @@ -65,8 +65,8 @@ jobs: python-version: '3.x' - name: Install test dependencies - run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker - + run: | + pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker - name: Run Molecule tests run: | molecule test diff --git a/README.md b/README.md index 45f086a..a3c4199 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Set up the latest version of [Node.js](https://nodejs.org) and [npm](https://www #### Variables -* `nodejs_version` [default: `nodejs-v12x`]: Version to install (e.g. `nodejs-v17x`, `nodejs-v16x`, `nodejs-v15x`, `nodejs-v14x`, `nodejs-v13x`, `nodejs-v12x`, `nodejs-v10x`, `nodejs-v8x`, `nodejs-v7x`, `nodejs-v6x`, `nodejs-v5x`, `nodejs-v012`, `nodejs-v010`, `iojs-v3x`, `iojs-v2x`, `iojs-v1x`, or a specific version, e.g. `12.18.1`) -* `nodejs_install` [default: `[build-essential]`]: Packages to install +* `nodejs_version` [default: `nodejs-v16x`]: Version to install (e.g. `nodejs-v23x`, ..., `nodejs-v010`, `iojs-v3x`, `iojs-v2x`, `iojs-v1x` +* `nodejs_install` [default: `['build-essential']`]: Packages to install * `nodejs_npm_packages`: [default: `[]`]: Node.js packages to install (globally) * `nodejs_npm_packages.{n}.name`: [required]: The name of the package * `nodejs_npm_packages.{n}.version`: [optional]: The version of the package diff --git a/Vagrantfile b/Vagrantfile index 7f58430..e86d32d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,13 +4,6 @@ role = File.basename(File.expand_path(File.dirname(__FILE__))) boxes = [ - { - :name => "ubuntu-1604", - :box => "bento/ubuntu-16.04", - :ip => '10.0.0.12', - :cpu => "50", - :ram => "256" - }, { :name => "ubuntu-1804", :box => "bento/ubuntu-18.04", @@ -23,7 +16,21 @@ boxes = [ :box => "bento/ubuntu-20.04", :ip => '10.0.0.14', :cpu => "50", - :ram => "384" + :ram => "512" + }, + { + :name => "ubuntu-2204", + :box => "bento/ubuntu-22.04", + :ip => '10.0.0.15', + :cpu => "50", + :ram => "512" + }, + { + :name => "ubuntu-2404", + :box => "bento/ubuntu-24.04", + :ip => '10.0.0.16', + :cpu => "50", + :ram => "512" }, { :name => "debian-10", @@ -44,7 +51,7 @@ boxes = [ :box => "bento/debian-12", :ip => '10.0.0.20', :cpu => "50", - :ram => "256" + :ram => "384" }, ] diff --git a/defaults/main.yml b/defaults/main.yml index 55dd8a4..d283616 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ # defaults file --- -nodejs_version: 'nodejs-v12x' +nodejs_version: 'nodejs-v16x' nodejs_install: # To compile and install native addons from npm you may also need to install build tools diff --git a/meta/main.yml b/meta/main.yml index 54b55e1..13f948d 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,9 +1,8 @@ # meta file --- galaxy_info: - namespace: oefenweb + author: oefenweb role_name: nodejs - author: Mischa ter Smitten company: Oefenweb.nl B.V. description: Set up the latest version of Node.js and npm in Debian-like systems license: MIT @@ -11,9 +10,10 @@ galaxy_info: platforms: - name: Ubuntu versions: - - xenial - bionic - focal + - jammy + - noble - name: Debian versions: - buster diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml index c3d7e2a..1062b36 100644 --- a/molecule/default/collections.yml +++ b/molecule/default/collections.yml @@ -1,6 +1,2 @@ --- -collections: - - name: community.docker - version: '>=1.2.0,<2' - - name: community.general - version: '>=2,<3' +collections: [] diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 8841165..908aaf6 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -5,7 +5,7 @@ driver: name: docker platforms: - name: instance - image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest" + image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw diff --git a/vars/main.yml b/vars/main.yml index 44f81a7..f95be76 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,12 @@ # vars file --- nodejs_version_map: + nodejs-v23x: '23.x' + nodejs-v22x: '22.x' + nodejs-v21x: '21.x' + nodejs-v20x: '20.x' + nodejs-v19x: '19.x' + nodejs-v18x: '18.x' nodejs-v17x: '17.x' nodejs-v16x: '16.x' nodejs-v15x: '15.x'