Install using ansible-galaxy via git instead of cloning directly.

ansible-collections · Apr 26, 2024 · 0c421ef · 0c421ef
1 parent 3d6cb51
commit 0c421ef
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -41,8 +41,8 @@ jobs:
         with:
           ansible-core-version: ${{ matrix.ansible }}
           testing-type: sanity
-          pre-test-cmd: >-
-            git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1
+          test-deps: >-
+            git+https://github.com/ansible-collections/community.library_inventory_filtering.git,stable-1
 
   units:
     runs-on: ubuntu-latest
@@ -66,13 +66,11 @@ jobs:
         with:
           ansible-core-version: ${{ matrix.ansible }}
           testing-type: units
-          # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
           pre-test-cmd: >-
-            git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1
-            ;
-            git clone --depth=1 --single-branch https://github.com/ansible-collections/community.internal_test_tools.git ../../community/internal_test_tools
-            ;
             tests/unit/replace-requirements.sh requirements-${{ matrix.ansible }}.txt
+          test-deps: >-
+            git+https://github.com/ansible-collections/community.internal_test_tools.git,main
+            git+https://github.com/ansible-collections/community.library_inventory_filtering.git,stable-1
 
   integration:
     # Ansible-test on various stable branches does not yet work well with cgroups v2.
@@ -131,10 +129,9 @@ jobs:
           integration-continue-on-error: 'false'
           integration-diff: 'false'
           integration-retry-on-error: 'true'
-          # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
           pre-test-cmd: >-
-            git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1
-            ;
             tests/integration/replace-requirements.sh requirements-${{ matrix.ansible }}.txt
+          test-deps: >-
+            git+https://github.com/ansible-collections/community.library_inventory_filtering.git,stable-1
           target-python-version: ${{ matrix.python }}
           testing-type: integration