From e3000939ef316dbd1e14805699231fadf3064bd0 Mon Sep 17 00:00:00 2001 From: Sergey <6213510+sshnaidm@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:06:45 +0300 Subject: [PATCH] Fix python versions for CI, drop 2.7 job (#601) Signed-off-by: Sagi Shnaidman --- .../collection-continuous-integration.yml | 26 +++++++++++-------- .../workflows/collection-publish-dry-run.yml | 2 +- .github/workflows/collection-publish.yml | 2 +- .github/workflows/connections_tests.yml | 12 ++++----- .github/workflows/podman_container.yml | 4 +-- .github/workflows/podman_containers.yml | 2 +- .github/workflows/podman_secret.yml | 2 +- .github/workflows/unittests.yml | 2 +- 8 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index de3e1e5..8638e8e 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -15,9 +15,9 @@ jobs: runner-os: - ubuntu-22.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 runner-python-version: - - 3.8 + - 3.9 steps: - name: Check out ${{ github.repository }} on disk uses: actions/checkout@v3 @@ -57,27 +57,31 @@ jobs: runner-os: - ubuntu-22.04 runner-python-version: - - 3.8 + - 3.9 ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 - git+https://github.com/ansible/ansible.git@devel python-version: - - 3.8 + - 3.9 include: - - runner-os: ubuntu-20.04 - runner-python-version: 2.7 - ansible-version: ansible<2.10 - python-version: 2.7 - runner-os: ubuntu-22.04 runner-python-version: '3.10' ansible-version: git+https://github.com/ansible/ansible.git@devel python-version: '3.10' - exclude: - runner-os: ubuntu-22.04 runner-python-version: 3.8 - ansible-version: git+https://github.com/ansible/ansible.git@devel + ansible-version: ansible<2.10 python-version: 3.8 + exclude: + - runner-os: ubuntu-22.04 + runner-python-version: 3.9 + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: 3.9 + - runner-os: ubuntu-22.04 + runner-python-version: 3.9 + ansible-version: ansible<2.10 + python-version: 3.9 steps: - name: Set up Python ${{ matrix.runner-python-version }} diff --git a/.github/workflows/collection-publish-dry-run.yml b/.github/workflows/collection-publish-dry-run.yml index ae80857..50be466 100644 --- a/.github/workflows/collection-publish-dry-run.yml +++ b/.github/workflows/collection-publish-dry-run.yml @@ -28,7 +28,7 @@ jobs: runner-os: - ubuntu-22.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 runner-python-version: - 3.9 steps: diff --git a/.github/workflows/collection-publish.yml b/.github/workflows/collection-publish.yml index 845d1c3..83564fb 100644 --- a/.github/workflows/collection-publish.yml +++ b/.github/workflows/collection-publish.yml @@ -13,7 +13,7 @@ jobs: runner-os: - ubuntu-22.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 runner-python-version: - 3.9 steps: diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml index df91cb0..58f7fbe 100644 --- a/.github/workflows/connections_tests.yml +++ b/.github/workflows/connections_tests.yml @@ -33,9 +33,9 @@ jobs: runner-os: - ubuntu-22.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 runner-python-version: - - 3.8 + - 3.9 steps: - name: Check out ${{ github.repository }} on disk uses: actions/checkout@v3 @@ -77,7 +77,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -85,7 +85,7 @@ jobs: #- ubuntu-16.04 #- macos-latest python-version: - #- 3.8 + #- 3.9 - 3.9 #- 3.6 #- 3.5 @@ -167,7 +167,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.13 + - git+https://github.com/ansible/ansible.git@stable-2.15 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -175,7 +175,7 @@ jobs: #- ubuntu-16.04 #- macos-latest python-version: - #- 3.8 + #- 3.9 - 3.9 #- 3.6 #- 3.5 diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index ed2276a..eeaa980 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -41,7 +41,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.14 + - git+https://github.com/ansible/ansible.git@stable-2.15 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -51,7 +51,7 @@ jobs: - unstable include: - os: ubuntu-22.04 - ansible-version: git+https://github.com/ansible/ansible.git@stable-2.14 + ansible-version: git+https://github.com/ansible/ansible.git@stable-2.15 python-version: 3.9 podman-version: stable diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml index 6cfc056..1efb039 100644 --- a/.github/workflows/podman_containers.yml +++ b/.github/workflows/podman_containers.yml @@ -41,7 +41,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.14 + - git+https://github.com/ansible/ansible.git@stable-2.15 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 diff --git a/.github/workflows/podman_secret.yml b/.github/workflows/podman_secret.yml index a9783e0..da3dc04 100644 --- a/.github/workflows/podman_secret.yml +++ b/.github/workflows/podman_secret.yml @@ -37,7 +37,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.14 + - git+https://github.com/ansible/ansible.git@stable-2.15 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index a6a23bc..b0df88b 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -15,7 +15,7 @@ jobs: runner-os: - ubuntu-22.04 # ansible-version: - # - git+https://github.com/ansible/ansible.git@stable-2.13 + # - git+https://github.com/ansible/ansible.git@stable-2.15 runner-python-version: - 3.9 steps: