From ca5742936d88685687a1d390991852ec6a51d7e7 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 12 Sep 2022 19:58:52 +0200 Subject: [PATCH] Install using ansible-galaxy via git instead of cloning directly. --- .github/workflows/ansible-test.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 833a5a5d..4431bea5 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -48,10 +48,9 @@ jobs: ansible-core-version: ${{ matrix.ansible }} codecov-token: ${{ secrets.CODECOV_TOKEN }} testing-type: sanity - # 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 https://github.com/ansible-collections/ansible.netcommon.git ../../ansible/netcommon - git clone --depth=1 --single-branch https://github.com/ansible-collections/ansible.utils.git ../../ansible/utils + test-deps: >- + git+https://github.com/ansible-collections/ansible.utils.git,main + git+https://github.com/ansible-collections/ansible.netcommon.git,main units: # Ansible-test on various stable branches does not yet work well with cgroups v2. @@ -84,10 +83,9 @@ jobs: ansible-core-version: ${{ matrix.ansible }} codecov-token: ${{ secrets.CODECOV_TOKEN }} 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 https://github.com/ansible-collections/ansible.netcommon.git ../../ansible/netcommon - git clone --depth=1 --single-branch https://github.com/ansible-collections/ansible.utils.git ../../ansible/utils + test-deps: >- + git+https://github.com/ansible-collections/ansible.utils.git,main + git+https://github.com/ansible-collections/ansible.netcommon.git,main integration: # Ansible-test on various stable branches does not yet work well with cgroups v2. @@ -141,9 +139,8 @@ 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 https://github.com/ansible-collections/ansible.netcommon.git ../../ansible/netcommon - git clone --depth=1 --single-branch https://github.com/ansible-collections/ansible.utils.git ../../ansible/utils + test-deps: >- + git+https://github.com/ansible-collections/ansible.utils.git,main + git+https://github.com/ansible-collections/ansible.netcommon.git,main target-python-version: ${{ matrix.python }} testing-type: integration