Workflow: Fixed rebase error

ngine-io · Jan 15, 2025 · 7578a5a · 7578a5a
1 parent 2f0da6e
commit 7578a5a
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,9 +31,6 @@ jobs:
       - name: Install test dependencies.
         run: pip3 install ansible ansible-lint
 
-      - name: Install ansible test dependencies
-        run: ansible-galaxy install -r molecule/test_requirements.yml
-
       - name: Lint code.
         run: |
           ansible-lint .
@@ -46,32 +43,15 @@ 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
           - v0.22
           - v0.21
         playbook:
-<<<<<<< HEAD
-<<<<<<< HEAD
-          - converge.yml
-=======
-          - converge
->>>>>>> 01b77ce (CI Workflow: Updated matrix)
-=======
           - converge.yml
->>>>>>> 3a34eee (CI Workflow: Fixed playbook definition)
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4