Skip to content

Commit

Permalink
Merge pull request #25 from Oefenweb/add-support-for-noble
Browse files Browse the repository at this point in the history
Add support for Noble
  • Loading branch information
tersmitten authored Nov 7, 2024
2 parents cb94b2a + b56eb75 commit 3cad656
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 26 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 16 additions & 9 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -44,7 +51,7 @@ boxes = [
:box => "bento/debian-12",
:ip => '10.0.0.20',
:cpu => "50",
:ram => "256"
:ram => "384"
},
]

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# 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
min_ansible_version: 2.10.0
platforms:
- name: Ubuntu
versions:
- xenial
- bionic
- focal
- jammy
- noble
- name: Debian
versions:
- buster
Expand Down
6 changes: 1 addition & 5 deletions molecule/default/collections.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
---
collections:
- name: community.docker
version: '>=1.2.0,<2'
- name: community.general
version: '>=2,<3'
collections: []
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 3cad656

Please sign in to comment.