From 5e8a62acbc11f58dd0a547c6ff1ef65ca3e4f20d Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 8 Jun 2025 20:50:18 +0200 Subject: [PATCH] [stable-3] Fix CI (#1087) * Forgot community.general. (cherry picked from commit 2108c3dc712f89cd5f1174464f048c939cfeff26) * Use matching c.g branch for older ansible-core versions. * Fix GH workflow. --- .github/workflows/ansible-test.yml | 2 +- antsibull-nox.toml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 8c49d10b..38b07717 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -218,7 +218,7 @@ jobs: ; git clone --depth=1 --single-branch --branch stable-2 https://github.com/ansible-collections/community.crypto.git ../../community/crypto ; - git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general + git clone --depth=1 --single-branch --branch stable-9 https://github.com/ansible-collections/community.general.git ../../community/general ; git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1 ${{ matrix.extra-constraints && format('; echo ''{0}'' >> tests/utils/constraints.txt', matrix.extra-constraints) || '' }} diff --git a/antsibull-nox.toml b/antsibull-nox.toml index 2dbd1d5f..3d7a6166 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -3,24 +3,35 @@ # SPDX-FileCopyrightText: 2025 Felix Fontein [collection_sources] +"community.general" = "git+https://github.com/ansible-collections/community.general.git,main" "community.internal_test_tools" = "git+https://github.com/ansible-collections/community.internal_test_tools.git,main" "community.library_inventory_filtering_v1" = "git+https://github.com/ansible-collections/community.library_inventory_filtering.git,stable-1" [collection_sources_per_ansible.'2.11'] "community.crypto" = "git+https://github.com/ansible-collections/community.crypto.git,stable-2" +# community.general's stable-8 branch needs ansible-core >= 2.13 +"community.general" = "git+https://github.com/ansible-collections/community.general.git,stable-7" [collection_sources_per_ansible.'2.12'] "community.crypto" = "git+https://github.com/ansible-collections/community.crypto.git,stable-2" +# community.general's stable-8 branch needs ansible-core >= 2.13 +"community.general" = "git+https://github.com/ansible-collections/community.general.git,stable-7" [collection_sources_per_ansible.'2.13'] "community.crypto" = "git+https://github.com/ansible-collections/community.crypto.git,stable-2" +# community.general's stable-10 branch needs ansible-core >= 2.15 +"community.general" = "git+https://github.com/ansible-collections/community.general.git,stable-9" [collection_sources_per_ansible.'2.14'] "community.crypto" = "git+https://github.com/ansible-collections/community.crypto.git,stable-2" +# community.general's stable-10 branch needs ansible-core >= 2.15 +"community.general" = "git+https://github.com/ansible-collections/community.general.git,stable-9" [collection_sources_per_ansible.'2.15'] # community.crypto's main branch needs ansible-core >= 2.17 "community.crypto" = "git+https://github.com/ansible-collections/community.crypto.git,stable-2" +# community.general's main branch needs ansible-core >= 2.16 +"community.general" = "git+https://github.com/ansible-collections/community.general.git,stable-10" [collection_sources_per_ansible.'2.16'] # community.crypto's main branch needs ansible-core >= 2.17