diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index 7f32a08..06cd44f 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -10,7 +10,7 @@ on: jobs: galaxy: name: Ansible Galaxy - uses: systemli/github-ansible-workflow/.github/workflows/ansible-galaxy-workflow.yaml@v1.4.0 + uses: systemli/github-ansible-workflow/.github/workflows/ansible-galaxy-workflow.yaml@v1.6.0 with: git-branch: ${{ github.ref_name }} secrets: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e950d7..4fcbf81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,6 +13,6 @@ on: jobs: integration: name: Integration - uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.4.0 + uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.6.0 with: - distros: '[ "debian12", "debian11", "ubuntu2404", "ubuntu2204" ]' + distros: '[ "debian13", "debian12", "ubuntu2404", "ubuntu2204" ]' diff --git a/meta/main.yml b/meta/main.yml index 2adf519..ab4f6f2 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,12 +5,12 @@ galaxy_info: description: role to maintain and configure etherpad lite company: systemli.org license: GPLv3 - min_ansible_version: "2.3" + min_ansible_version: "2.4" platforms: - name: Debian versions: + - trixie - bookworm - - bullseye - name: Ubuntu versions: - noble diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 3731237..73c565d 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,15 +1,27 @@ --- driver: - name: vagrant - provider: - name: virtualbox + name: docker + platforms: - - name: bookworm64 - box: debian/bookworm64 - instance_raw_config_args: - - "vm.network 'forwarded_port', guest: 9001, host: 9001" - - name: bullseye64 - box: debian/bullseye64 + - name: debian13 + image: "geerlingguy/docker-debian13-ansible:latest" + command: "" + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + - /var/lib/containerd + cgroupns_mode: host + privileged: true + pre_build_image: true + provisioner: name: ansible - become: true + become: True + ansible_args: + - --diff + +lint: yamllint . + +#dependency: +# name: galaxy +# options: +# requirements-file: requirements.yml diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 709175a..17359bf 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -15,7 +15,7 @@ ansible.builtin.include_role: name: geerlingguy.nodejs vars: - nodejs_version: 20.x + nodejs_version: 22.x nodejs_install_npm_user: "root" nodejs_npm_global_packages: - name: pnpm