Merge pull request #4 from AcroMedia/updates

Bump platform support, update phar version
AcroMedia · Jun 12, 2024 · ba5a6fb · ba5a6fb
2 parents 648df2e + e2b2d74
commit ba5a6fb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git 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/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/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -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:

diff --git 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:

diff --git 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