From 9f13c7ae2d72b1dc2052151a4c796a6f230fbcab Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 15:19:46 +0800 Subject: [PATCH 1/7] Update error handling in action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d6e5b4d05..44dfb7d2c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: registry-username: ${{ secrets.DOCKERHUB_USERNAME }} registry-password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Setup Azure Service Bus - uses: Particular/setup-azureservicebus-action@v2.3.0 + uses: Particular/setup-azureservicebus-action@a8c03bae669e78ff8d54c3eeccbe5a676cdf650b if: matrix.test-category == 'AzureServiceBus' with: connection-string-name: ServiceControl_TransportTests_ASBS_ConnectionString From cb3e280a98f2cae12f8170cf3525f064d4b98c9c Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 15:32:59 +0800 Subject: [PATCH 2/7] Pin AZ cli --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44dfb7d2c8..d6c2ba5b28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,14 @@ jobs: - name: Smoke test PowerShell module import if: matrix.os-name == 'Windows' run: Import-Module ./deploy/PowerShellModules/Particular.ServiceControl.Management + # there is an issue with az cli and python 3.14, so for now we need to pin it + # once the issue is resolved it should be able to be re-floated + # https://github.com/Azure/azure-cli/issues/32980 + - name: Pin Azure CLI + uses: azure/setup-azure-cli@v3 + if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL' + with: + version: 2.64.0 - name: Azure login uses: azure/login@v3.0.0 if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL' From b57dc686e34d524011b68c68dd0d4d01344e49f7 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 15:45:15 +0800 Subject: [PATCH 3/7] Try a differnt method of pinning az --- .github/workflows/ci.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6c2ba5b28..24664c22e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,14 +64,24 @@ jobs: - name: Smoke test PowerShell module import if: matrix.os-name == 'Windows' run: Import-Module ./deploy/PowerShellModules/Particular.ServiceControl.Management + # there is an issue with az cli and python 3.14, so for now we need to pin it # once the issue is resolved it should be able to be re-floated # https://github.com/Azure/azure-cli/issues/32980 - - name: Pin Azure CLI - uses: azure/setup-azure-cli@v3 - if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL' + - name: Set Python 3.13 (Linux) + if: matrix.os-name == 'Linux' + uses: actions/setup-python@v5 with: - version: 2.64.0 + python-version: '3.13' + + - name: Install pinned Azure CLI on Python 3.13 (Linux) + if: matrix.os-name == 'Linux' + shell: bash + run: | + python -m pip install --upgrade pip + python -m pip install --user "azure-cli==2.64.0" + echo "$HOME/.local/bin" >> "$GITHUB_PATH" + - name: Azure login uses: azure/login@v3.0.0 if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL' From 660e219a1d75fb2238418b524fe6c4d5beaaab4a Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 15:55:01 +0800 Subject: [PATCH 4/7] Also pin the container test az cli --- .github/workflows/ci.yml | 5 ++--- .../workflows/container-integration-test.yml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24664c22e4..90baf979c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,13 +69,12 @@ jobs: # once the issue is resolved it should be able to be re-floated # https://github.com/Azure/azure-cli/issues/32980 - name: Set Python 3.13 (Linux) - if: matrix.os-name == 'Linux' + if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus uses: actions/setup-python@v5 with: python-version: '3.13' - - name: Install pinned Azure CLI on Python 3.13 (Linux) - if: matrix.os-name == 'Linux' + if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus shell: bash run: | python -m pip install --upgrade pip diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index 4115b0ecdd..e81c88f962 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -57,6 +57,23 @@ jobs: uses: actions/setup-dotnet@v6.0.0 with: global-json-file: global.json + + # there is an issue with az cli and python 3.14, so for now we need to pin it + # once the issue is resolved it should be able to be re-floated + # https://github.com/Azure/azure-cli/issues/32980 + - name: Set Python 3.13 (Linux) + if: matrix.name == 'asb' + uses: actions/setup-python@v5 + with: + python-version: '3.13' + - name: Install pinned Azure CLI on Python 3.13 (Linux) + if: matrix.name == 'asb' + shell: bash + run: | + python -m pip install --upgrade pip + python -m pip install --user "azure-cli==2.64.0" + echo "$HOME/.local/bin" >> "$GITHUB_PATH" + - name: Run MinVer uses: Particular/run-minver-action@v1.0.0 - name: Log in to GitHub container registry From 59c9b4e825c175d6094ef22e00f4e8b567ffbe1a Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 16:00:26 +0800 Subject: [PATCH 5/7] Missing quotes --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90baf979c7..cfe38b5ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,12 +69,12 @@ jobs: # once the issue is resolved it should be able to be re-floated # https://github.com/Azure/azure-cli/issues/32980 - name: Set Python 3.13 (Linux) - if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus + if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus' uses: actions/setup-python@v5 with: python-version: '3.13' - name: Install pinned Azure CLI on Python 3.13 (Linux) - if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus + if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus' shell: bash run: | python -m pip install --upgrade pip From 8cb2c0916da00ea14215aa6a13bc158a162402a8 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 16:43:11 +0800 Subject: [PATCH 6/7] Use correct version of action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfe38b5ed4..c95375c1d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: registry-username: ${{ secrets.DOCKERHUB_USERNAME }} registry-password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Setup Azure Service Bus - uses: Particular/setup-azureservicebus-action@a8c03bae669e78ff8d54c3eeccbe5a676cdf650b + uses: Particular/setup-azureservicebus-action@2.4.0 if: matrix.test-category == 'AzureServiceBus' with: connection-string-name: ServiceControl_TransportTests_ASBS_ConnectionString From 62329e35e56b735228e9976a70c967fc0ae0f9b6 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 20 Jul 2026 17:05:07 +0800 Subject: [PATCH 7/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c95375c1d7..02d20cd60b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: registry-username: ${{ secrets.DOCKERHUB_USERNAME }} registry-password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Setup Azure Service Bus - uses: Particular/setup-azureservicebus-action@2.4.0 + uses: Particular/setup-azureservicebus-action@v2.4.0 if: matrix.test-category == 'AzureServiceBus' with: connection-string-name: ServiceControl_TransportTests_ASBS_ConnectionString