From f5ed0689c1f55d009a0d112d3af34eb0468e2451 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 27 Jul 2020 16:14:59 +0200 Subject: [PATCH] Update dependencies (#694) * Bump dependency versions. * No longer need to use git checkouts. --- galaxy.yml | 6 +++--- tests/utils/shippable/shippable.sh | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 383216e2bb..0f523477f0 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -9,10 +9,10 @@ license_file: COPYING tags: null # NOTE: No more dependencies can be added to this list dependencies: - ansible.netcommon: '>=0.0.2' + ansible.netcommon: '>=1.0.0' ansible.posix: '>=1.0.0' - community.kubernetes: '>=0.1.0' - google.cloud: '>=0.0.9' + community.kubernetes: '>=0.11.1' # check https://galaxy.ansible.com/community/kubernetes + google.cloud: '>=0.10.1' # check https://galaxy.ansible.com/google/cloud repository: https://github.com/ansible-collections/community.general #documentation: https://github.com/ansible-collection-migration/community.general/tree/main/docs homepage: https://github.com/ansible-collections/community.general diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index d1deaa741f..f067ce6d7c 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -69,10 +69,8 @@ cd "${TEST_DIR}" # START: HACK install dependencies retry ansible-galaxy -vvv collection install ansible.netcommon retry ansible-galaxy -vvv collection install ansible.posix -# retry ansible-galaxy -vvv collection install community.crypto -- the currently published version doesn't work well with Ansible 2.9, use main instead: -retry git clone https://github.com/ansible-collections/community.crypto.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/crypto" -# retry ansible-galaxy -vvv collection install community.internal_test_tools - we need git checkout until 0.2.0 has been released -retry git clone https://github.com/ansible-collections/community.internal_test_tools.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/internal_test_tools" +retry ansible-galaxy -vvv collection install community.crypto +retry ansible-galaxy -vvv collection install community.internal_test_tools retry ansible-galaxy -vvv collection install community.kubernetes retry ansible-galaxy -vvv collection install google.cloud