Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24.04 Support #45

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ on:
pull_request:
branches:
- master
- 2-nginx_aliases-is-a-lie
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: molecule
Expand All @@ -28,17 +27,19 @@ jobs:
strategy:
matrix:
image:
- geerlingguy/docker-ubuntu2404-ansible:latest
- geerlingguy/docker-ubuntu2204-ansible:latest
- geerlingguy/docker-ubuntu2004-ansible:latest
- geerlingguy/docker-ubuntu1804-ansible:latest
#- geerlingguy/docker-ubuntu1804-ansible:latest # No PHP 8.1 support
#- geerlingguy/docker-centos8-ansible:latest # Can't test this until the PHP role supports CentOS
#- geerlingguy/docker-centos7-ansible:latest # Can't test this until the PHP role supports CentOS
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: molecule
uses: robertdebock/molecule-action@2.6.8
uses: robertdebock/molecule-action@6.0.1
with:
image: "${{ matrix.image }}"
options: parallel
Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- noble # 24.04
- jammy # 22.04
- focal # 20.04
- bionic # 18.04
#- bionic # 18.04 ... No php 8.1 support.
- name: EL # Or CentOS, or Rocky
versions:
- 8
Expand Down
6 changes: 3 additions & 3 deletions molecule/default/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ nginx_robots_policy: production
# ---------------------------------
# acromedia.php
# ---------------------------------
php_default_version: 8.1
php_default_version: 8.3
php_use_legacy_module_lists: false
php_versions:
- 7.4
- 8.0
- 8.1
- 8.2
- 8.3

# ---------------------------------
# acromedia.virtual-host
Expand Down
6 changes: 5 additions & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ driver:
name: docker
platforms:
- name: instance
image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu2404-ansible:latest'}
command: ${MOLECULE_DOCKER_COMMAND:-""}
cgroupns_mode: host
privileged: true
pre_build_image: true
override_command: false
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /run
- /tmp
Expand Down
Loading