From 14014291bad9457a23a9dbd56432f8508e90d94a Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Fri, 31 May 2024 16:38:49 -0700 Subject: [PATCH 1/4] fix: add platform support, update phar version --- meta/main.yml | 12 ++++++++---- tasks/main.yml | 6 ++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 880e94b..13d628f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -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: [] diff --git a/tasks/main.yml b/tasks/main.yml index b768ce5..056ab19 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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 From b9cf8bca7f55f7eb7953934485d48bbf7a18ed08 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Fri, 31 May 2024 16:44:04 -0700 Subject: [PATCH 2/4] fix: test --- molecule/default/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index e839f97..20f2365 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -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: From 9d7052139b12f9b6bdc595769c5fbcd8b95a41b6 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Wed, 12 Jun 2024 16:43:52 -0700 Subject: [PATCH 3/4] fix: ubuntu 22.04 and 24.04 tests --- .github/workflows/molecule.yml | 8 +++++--- molecule/default/molecule.yml | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 50ba424..2805c5d 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -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 @@ -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 diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 96c12b5..c31edae 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -5,10 +5,11 @@ 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: From e2b2d741d8f104e8c98502c2f84f432d73c1142a Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Wed, 12 Jun 2024 16:46:51 -0700 Subject: [PATCH 4/4] fix: no role name check --- molecule/default/molecule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index c31edae..7f0f75c 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,4 +1,5 @@ --- +role_name_check: 1 dependency: name: galaxy driver: