diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 4da38557..3345063e 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -81,9 +81,9 @@ jobs: wsl: - Ubuntu-24.04 ansible: - - stable-2.19 - stable-2.20 - stable-2.21 + - stable-2.22 - devel python: - python3 @@ -176,14 +176,16 @@ jobs: # Override break-sys-pkg defaults, because we don't need to bother with python venv for CI # - # ansible-core devel requires Python >= 3.13 (see pyproject.toml on the devel branch), + # ansible-core 2.22 and newer (including devel) require Python >= 3.13 (see pyproject.toml on those branches), # which isn't packaged in the Ubuntu-24.04 WSL image used here (default python3 is 3.12). # actions/setup-python only provisions the Windows host, not this WSL guest, so install a - # standalone Python 3.13 via uv for that leg instead of an apt/PPA install. - - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.19, stable-2.20, devel) + # standalone Python 3.13 via uv for those legs instead of an apt/PPA install. + - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.20, stable-2.21, stable-2.22, devel) run: | PYTHON_BIN=python3 - if [ "${{ matrix.ansible }}" = "devel" ]; then + USE_UV_PYTHON=true + case "${{ matrix.ansible }}" in stable-2.20|stable-2.21) USE_UV_PYTHON=false ;; esac + if [ "$USE_UV_PYTHON" = true ]; then curl -LsSf https://astral.sh/uv/install.sh | sh "$HOME/.local/bin/uv" python install 3.13 PYTHON_BIN="$("$HOME/.local/bin/uv" python find 3.13)" @@ -191,7 +193,7 @@ jobs: "$PYTHON_BIN" -m pip config set global.break-system-packages true "$PYTHON_BIN" -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 "$PYTHON_BIN" -m pip install "https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz" --disable-pip-version-check --retries 10 - if [ "${{ matrix.ansible }}" = "devel" ]; then + if [ "$USE_UV_PYTHON" = true ]; then # uv's standalone Python isn't on PATH, and its console scripts don't land in # /usr/local/bin like the system python3 case does, so symlink them there for later # wsl-bash steps (each one is a fresh --norc/--noprofile shell, nothing persists). diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 3a8d9698..fc26d0e5 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -62,9 +62,9 @@ jobs: ansible: # It's important that Sanity is tested against all stable-X.Y branches # Testing against `devel` may fail as new tests are added. - - stable-2.19 - stable-2.20 - stable-2.21 + - stable-2.22 - devel runs-on: ubuntu-latest steps: @@ -179,12 +179,12 @@ jobs: fail-fast: false matrix: ansible: - - stable-2.19 - stable-2.20 - stable-2.21 + - stable-2.22 - devel python: - - 3.10 + - 3.11 steps: - name: Check out code diff --git a/README.md b/README.md index adcab67b..a5f448d2 100644 --- a/README.md +++ b/README.md @@ -69,10 +69,9 @@ To learn how to maintain / become a maintainer of this collection, refer to the ## Tested with ### Ansible - -- 2.19 - 2.20 - 2.21 +- 2.22 - devel ### SQL Server diff --git a/changelogs/fragments/383-ansible-core-2-22-ci.yml b/changelogs/fragments/383-ansible-core-2-22-ci.yml new file mode 100644 index 00000000..99f6a10e --- /dev/null +++ b/changelogs/fragments/383-ansible-core-2-22-ci.yml @@ -0,0 +1,3 @@ +--- +trivial: + - CI - added ansible-core ``stable-2.22`` to the sanity, integration, and Windows integration test matrices, dropped ``stable-2.19`` (EOL 2026-11-30), and raised the integration test Python version to 3.11.