From 6c1e04094f3d360514003b28826ffd2f47669557 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 3 May 2025 13:24:31 +0200 Subject: [PATCH] Use community.crypto 2.x.y on ubuntu2004. (cherry picked from commit 38591969ddcd78ac0214e33eb1c25cb1ae0931e0) --- tests/utils/shippable/shippable.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 86cb80f3..f3e52b38 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -10,6 +10,7 @@ IFS='/:' read -ra args <<< "$1" ansible_version="${args[0]}" script="${args[1]}" +after_script="${args[2]}" function join { local IFS="$1"; @@ -73,6 +74,9 @@ COMMUNITY_CRYPTO_BRANCH=main if [ "${ansible_version}" == "2.16" ] || [ "${ansible_version}" == "2.15" ]; then COMMUNITY_CRYPTO_BRANCH=stable-2 fi +if [ "${script}" == "linux" ] && [ "$after_script" == "ubuntu2004" ]; then + COMMUNITY_CRYPTO_BRANCH=stable-2 +fi retry git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/library_inventory_filtering_v1" # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)