CI Workflow: Temporarily disabled rockylinux9

Salvoxia · Jan 15, 2025 · ca7311c · ca7311c
1 parent b2343b6
commit ca7311c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,12 +43,17 @@ jobs:
       matrix:
         distro:
           - debian12
+<<<<<<< HEAD
 <<<<<<< HEAD
           # Temporarily disabled due to "sudo: A password is required" error, see https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
           #- rockylinux9
 =======
           - rockylinux9
 >>>>>>> 01b77ce (CI Workflow: Updated matrix)
+=======
+          # Temporarily disabled due to "sudo: A password is required" error, see https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
+          #- rockylinux9
+>>>>>>> b8ea741 (CI Workflow: Temporarily disabled rockylinux9)
         blocky_version:
           - v0.24
           - v0.23