Upgrade to main branch and modernize configuration.

apollo13 · Jan 1, 2024 · 82ee2f6 · 82ee2f6
1 parent 30450c9
commit 82ee2f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 39 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,9 +4,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 env:
   ROLE_NAME: apollo13.borgbackup
@@ -19,11 +19,11 @@ jobs:
       matrix:
         molecule-distro:
           - "centos:7"
-          - "centos:8"
+          - "rockylinux:9"
           - "ubuntu:18.04"
-          - "ubuntu:20.04"
-          - "debian:buster"
-          - "fedora:33"
+          - "ubuntu:22.04"
+          - "debian:bookworm"
+          - "fedora:38"
 
     env:
       MOLECULE_DISTRO: ${{ matrix.molecule-distro }}
@@ -42,7 +42,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install wheel
-          python -m pip install molecule[ansible,docker,test,lint]
+          python -m pip install ansible molecule molecule-plugins[docker]
 
       - name: Molecule test
         run: |

diff --git a/.travis.yml b/.travis.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -1,7 +1,7 @@
 ---
 
 _platform_defaults: &platform_defaults
-  image: registry.gitlab.com/rocketduck/molecule-images/${MOLECULE_DISTRO:-centos:8}
+  image: registry.gitlab.com/rocketduck/molecule-images/${MOLECULE_DISTRO:-rockylinux:9}
   pull: true
   pre_build_image: true
   override_command: false