From c2f4fccd0187c68f2c87255b3a89a22787d17ce2 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 13 Jul 2024 12:58:42 -0400 Subject: [PATCH 01/16] chore: use newer python for dlevel --- .github/workflows/ansible-test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index cc7a886c..254160fb 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -54,7 +54,7 @@ jobs: - devel python: - python3 - - python3.10 + - python3.11 group: # windows/group/#/ - "1" - "2" From 208f8e7943b02e184ee978c44486905cf54742e6 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 13 Jul 2024 12:59:41 -0400 Subject: [PATCH 02/16] chore: fix python version --- .github/workflows/ansible-test-windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 254160fb..d21eeb1e 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -61,11 +61,11 @@ jobs: #- '3' exclude: - ansible: stable-2.13 - python: python3.10 + python: python3.11 - ansible: stable-2.14 - python: python3.10 + python: python3.11 - ansible: stable-2.15 - python: python3.10 + python: python3.11 - ansible: devel python: python3 defaults: From a96920d6aba3a9d46586d8a2615be58bdecb7020 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 13 Jul 2024 13:29:04 -0400 Subject: [PATCH 03/16] chore: tweak python again --- .github/workflows/ansible-test-windows.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index d21eeb1e..98286efb 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -54,18 +54,19 @@ jobs: - devel python: - python3 - - python3.11 + - python3.12 group: # windows/group/#/ - "1" - "2" - #- '3' exclude: - ansible: stable-2.13 - python: python3.11 + python: python3.12 - ansible: stable-2.14 - python: python3.11 + python: python3.12 - ansible: stable-2.15 - python: python3.11 + python: python3.12 + - ansible: stable-2.16 + python: python3.12 - ansible: devel python: python3 defaults: From 76b2c91f6b31822a75e44489494fc7e6819ed688 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sun, 14 Jul 2024 10:47:48 -0400 Subject: [PATCH 04/16] chore: update ubuntu wsl version --- .github/workflows/ansible-test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 98286efb..4961c1ec 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -107,7 +107,7 @@ jobs: - uses: Vampire/setup-wsl@v3.1.1 with: - distribution: Ubuntu-22.04 + distribution: Ubuntu-24.04 update: "true" use-cache: "true" additional-packages: | From d96489c7c6c3b048efb4347e2efe1f8a4920415b Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 11:50:57 -0400 Subject: [PATCH 05/16] Update .github/workflows/ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 4961c1ec..98286efb 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -107,7 +107,7 @@ jobs: - uses: Vampire/setup-wsl@v3.1.1 with: - distribution: Ubuntu-24.04 + distribution: Ubuntu-22.04 update: "true" use-cache: "true" additional-packages: | From 190b98172876c6724eeba46c49a0ae14d05002b4 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 12:09:24 -0400 Subject: [PATCH 06/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 98286efb..78975300 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -46,29 +46,28 @@ jobs: matrix: os: - windows-2022 + wsl: + - Ubuntu-24.04 ansible: - - stable-2.13 - - stable-2.14 - - stable-2.15 - stable-2.16 + - stable-2.17 - devel python: - python3 - - python3.12 + #- python3.10 group: # windows/group/#/ - "1" - "2" - exclude: - - ansible: stable-2.13 - python: python3.12 - - ansible: stable-2.14 - python: python3.12 - - ansible: stable-2.15 - python: python3.12 - - ansible: stable-2.16 - python: python3.12 - - ansible: devel - python: python3 + #- '3' + # exclude: + # - ansible: stable-2.13 + # python: python3.10 + # - ansible: stable-2.14 + # python: python3.10 + # - ansible: stable-2.15 + # python: python3.10 + # - ansible: devel + # python: python3 defaults: run: shell: wsl-bash {0} @@ -107,7 +106,7 @@ jobs: - uses: Vampire/setup-wsl@v3.1.1 with: - distribution: Ubuntu-22.04 + distribution: ${{ matrix.wsl }} update: "true" use-cache: "true" additional-packages: | From 6997334254d0b6add857b90ed0d1a73d7577ceec Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 12:35:22 -0400 Subject: [PATCH 07/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 78975300..e99fcbdb 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -107,7 +107,7 @@ jobs: - uses: Vampire/setup-wsl@v3.1.1 with: distribution: ${{ matrix.wsl }} - update: "true" + update: "false" use-cache: "true" additional-packages: | git From c3e93b8221b53387cd0c44304aac8fd7d91a0581 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 12:45:20 -0400 Subject: [PATCH 08/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index e99fcbdb..344e9771 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -143,8 +143,8 @@ jobs: - name: Install ansible-base (${{ matrix.ansible }}) run: | - ${{ matrix.python }} -m pip install --upgrade pip setuptools pypsrp --disable-pip-version-check --retries 10 - ${{ matrix.python }} -m pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check --retries 10 + sudo ${{ matrix.python }} -m pip install --upgrade pip setuptools pypsrp --disable-pip-version-check --retries 10 + sudo ${{ matrix.python }} -m pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check --retries 10 - name: Install collection dependencies id: collection-dependency From 9219eced8b21c63b8efae456115c5cfb6c3a3948 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 12:51:25 -0400 Subject: [PATCH 09/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 344e9771..0ef2a0eb 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -143,8 +143,8 @@ jobs: - name: Install ansible-base (${{ matrix.ansible }}) run: | - sudo ${{ matrix.python }} -m pip install --upgrade pip setuptools pypsrp --disable-pip-version-check --retries 10 - sudo ${{ matrix.python }} -m pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check --retries 10 + ${{ matrix.python }} -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 --break-system-packages + ${{ matrix.python }} -m pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check --retries 10 --break-system-packages - name: Install collection dependencies id: collection-dependency From a4061b7b81333c4241762ee3bc89b813591d4d32 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:03:25 -0400 Subject: [PATCH 10/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 0ef2a0eb..b6e92a5d 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -183,11 +183,15 @@ jobs: run: | pushd "${{ env.GHWS }}/ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}" ansible-test windows-integration -v --color --retry-on-error --continue-on-error --diff --coverage --requirements windows/group/${{ matrix.group }}/ + env: + PIP_BREAK_SYSTEM_PACKAGES: 1 - name: Generate coverage report run: | pushd "${{ env.GHWS }}/ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}" ansible-test coverage xml -v --requirements + env: + PIP_BREAK_SYSTEM_PACKAGES: 1 # See the reports at https://codecov.io/gh/lowlydba/lowlydba.sqlserver - uses: codecov/codecov-action@v4.5.0 From 6152590887094b9ea236b60028e54dd977462747 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:20:08 -0400 Subject: [PATCH 11/16] Revert "Update ansible-test-windows.yml" This reverts commit a4061b7b81333c4241762ee3bc89b813591d4d32. --- .github/workflows/ansible-test-windows.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index b6e92a5d..0ef2a0eb 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -183,15 +183,11 @@ jobs: run: | pushd "${{ env.GHWS }}/ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}" ansible-test windows-integration -v --color --retry-on-error --continue-on-error --diff --coverage --requirements windows/group/${{ matrix.group }}/ - env: - PIP_BREAK_SYSTEM_PACKAGES: 1 - name: Generate coverage report run: | pushd "${{ env.GHWS }}/ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}" ansible-test coverage xml -v --requirements - env: - PIP_BREAK_SYSTEM_PACKAGES: 1 # See the reports at https://codecov.io/gh/lowlydba/lowlydba.sqlserver - uses: codecov/codecov-action@v4.5.0 From 86396317e0014db1e60fdf38181d28301c76a6a2 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:20:57 -0400 Subject: [PATCH 12/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 0ef2a0eb..35add940 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -141,6 +141,9 @@ jobs: $ws = ConvertTo-LinuxPathCrappy -LiteralPath "${{ github.workspace }}" Add-Content -LiteralPath $env:GITHUB_ENV -Value "GHWS=$ws" + - name: Allow system breaking pip installs + run: python3 -m pip config set global.break-system-packages true + - name: Install ansible-base (${{ matrix.ansible }}) run: | ${{ matrix.python }} -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 --break-system-packages From b2097abb9e1808c77364d0e49bf763fb5df10bac Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:33:59 -0400 Subject: [PATCH 13/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 35add940..b85efad5 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -141,13 +141,16 @@ jobs: $ws = ConvertTo-LinuxPathCrappy -LiteralPath "${{ github.workspace }}" Add-Content -LiteralPath $env:GITHUB_ENV -Value "GHWS=$ws" + - name: Allow system breaking pip installs - run: python3 -m pip config set global.break-system-packages true + run: + # Override break-sys-pkg defaults, because we don't need to bother with python venv for CI - name: Install ansible-base (${{ matrix.ansible }}) run: | - ${{ matrix.python }} -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 --break-system-packages - ${{ matrix.python }} -m pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check --retries 10 --break-system-packages + ${{ matrix.python }} -m pip config set global.break-system-packages true + ${{ matrix.python }} -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 + ${{ matrix.python }} -m pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check --retries 10 - name: Install collection dependencies id: collection-dependency From c40cf3532a5d380a7eda5cc080b9490a654fb05e Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:42:50 -0400 Subject: [PATCH 14/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index b85efad5..6a550345 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -141,7 +141,6 @@ jobs: $ws = ConvertTo-LinuxPathCrappy -LiteralPath "${{ github.workspace }}" Add-Content -LiteralPath $env:GITHUB_ENV -Value "GHWS=$ws" - - name: Allow system breaking pip installs run: From db8e487cdfd7f15743c66e1c7cff3a874c1f7579 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:46:01 -0400 Subject: [PATCH 15/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 6a550345..33771cb4 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -54,20 +54,10 @@ jobs: - devel python: - python3 - #- python3.10 group: # windows/group/#/ - "1" - "2" #- '3' - # exclude: - # - ansible: stable-2.13 - # python: python3.10 - # - ansible: stable-2.14 - # python: python3.10 - # - ansible: stable-2.15 - # python: python3.10 - # - ansible: devel - # python: python3 defaults: run: shell: wsl-bash {0} From 0eb127887dad3d3bb4e06790fa6502fc4aa2b936 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 7 Sep 2024 13:46:21 -0400 Subject: [PATCH 16/16] Update ansible-test-windows.yml --- .github/workflows/ansible-test-windows.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 33771cb4..56c53726 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -131,9 +131,6 @@ jobs: $ws = ConvertTo-LinuxPathCrappy -LiteralPath "${{ github.workspace }}" Add-Content -LiteralPath $env:GITHUB_ENV -Value "GHWS=$ws" - - name: Allow system breaking pip installs - run: - # Override break-sys-pkg defaults, because we don't need to bother with python venv for CI - name: Install ansible-base (${{ matrix.ansible }}) run: |