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

Bump platform support, update phar version #4

Merged
merged 4 commits into from
Jun 12, 2024
Merged
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
8 changes: 5 additions & 3 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: molecule
Expand All @@ -27,16 +27,18 @@ 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-ubuntu1604-ansible:latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: molecule
uses: robertdebock/molecule-action@2.6.3
uses: robertdebock/molecule-action@6.0.1
with:
image: "${{ matrix.image }}"
options: parallel
Expand Down
12 changes: 8 additions & 4 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- trusty
- xenial
- noble
- jammy
- focal
- bionic
- trusty
- xenial
- name: EL
versions:
- 6
- 7
- 6
- 7
galaxy_tags: []
dependencies: []
6 changes: 4 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
---
role_name_check: 1
dependency:
name: galaxy
driver:
name: docker
platforms:
- name: instance
image: "${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu1804-ansible:latest'}"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true
provisioner:
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

tasks:
- name: Confirm drush installation is correct.
shell: drush --version | grep '8.1.17'
shell: drush --version | grep '8.4.11'
changed_when: false

- debug:
Expand Down
6 changes: 2 additions & 4 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
---
# tasks file for acro.drush

- name: Install drush from phar
get_url:
url: https://github.com/drush-ops/drush/releases/download/8.1.17/drush.phar
checksum: sha256:9c5b245c3a437851bded21fd52014dddd1f5eb8f3e9ee8230047533bd02829ba
url: https://github.com/drush-ops/drush/releases/download/8.4.11/drush.phar
checksum: sha256:e030f5e8f407199cc01b09a6fd635e67f7432a7950b2571bdf9024a6226ce6d4
dest: /usr/local/bin/drush
group: root
owner: root
Expand Down