From 79767543b81f1a273e399a07fc558ebb4a073992 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 21 Jul 2026 11:37:45 +0800 Subject: [PATCH 1/5] Remove version pinning of az cli, use fixed version of servicebus action --- .github/workflows/ci.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 542284e1a1..ae9ab2c3c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,22 +96,6 @@ jobs: background: true timeout-minutes: 5 run: dotnet build tests.proj --configuration Release -graph - # 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. - # This can be removed once https://github.com/Azure/azure-cli/issues/32869 is supported. - - name: Set Python 3.13 (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' && matrix.test-category == 'AzureServiceBus' - 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: Setup SQS environment variables if: matrix.test-category == 'SQS' run: | From b97fa00547be473b555fda583071e1bb0f7e1bb0 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Mon, 24 Aug 2026 16:59:42 +0800 Subject: [PATCH 2/5] remove pinning from another script --- .../workflows/container-integration-test.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index 480091ea97..c1b090387e 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -57,23 +57,6 @@ 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 d8d188c338101299b5735b124d883501f1302da5 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 13 Oct 2026 12:14:20 +0800 Subject: [PATCH 3/5] Update az cli before asb builds --- .github/workflows/ci.yml | 3 +++ .github/workflows/container-integration-test.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae9ab2c3c7..6ecffe328e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,9 @@ jobs: env: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) + - name: Upgrade Azure CLI + if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' + run: az upgrade --yes - name: Checkout uses: actions/checkout@v7.0.1 with: diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index c1b090387e..7b0aa6c816 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -49,6 +49,9 @@ jobs: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} shell: pwsh run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) + - name: Upgrade Azure CLI + if: matrix.name == 'asb' || matrix.name == 'asq' + run: az upgrade --yes - name: Checkout uses: actions/checkout@v7.0.1 with: From 22c5fe5741d5f97483590fb0752686d320e2a03a Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 13 Oct 2026 12:33:55 +0800 Subject: [PATCH 4/5] Linux az upgrade support --- .github/workflows/ci.yml | 8 ++++++-- .github/workflows/container-integration-test.yml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ecffe328e..473c3ee0e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,8 +53,12 @@ jobs: env: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) - - name: Upgrade Azure CLI - if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' + - name: Upgrade Azure CLI on Linux + if: matrix.os-name == 'Linux' && (matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues') + shell: bash + run: curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash + - name: Upgrade Azure CLI on Windows + if: matrix.os-name == 'Windows' && (matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues') run: az upgrade --yes - name: Checkout uses: actions/checkout@v7.0.1 diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index 7b0aa6c816..870afde4b2 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -51,7 +51,7 @@ jobs: run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) - name: Upgrade Azure CLI if: matrix.name == 'asb' || matrix.name == 'asq' - run: az upgrade --yes + run: curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash - name: Checkout uses: actions/checkout@v7.0.1 with: From b68edc7afa6d13cf0592691d05ce02a017eed71a Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 13 Oct 2026 12:50:13 +0800 Subject: [PATCH 5/5] Create shared action for az cli update --- .github/actions/upgrade-azure-cli/action.yml | 13 +++++++++++++ .github/workflows/ci.yml | 10 +++------- .github/workflows/container-integration-test.yml | 6 +++--- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .github/actions/upgrade-azure-cli/action.yml diff --git a/.github/actions/upgrade-azure-cli/action.yml b/.github/actions/upgrade-azure-cli/action.yml new file mode 100644 index 0000000000..7211bf829c --- /dev/null +++ b/.github/actions/upgrade-azure-cli/action.yml @@ -0,0 +1,13 @@ +name: Upgrade Azure CLI +description: Upgrades Azure CLI on Linux and Windows runners +runs: + using: composite + steps: + - name: Upgrade Azure CLI on Linux + if: runner.os == 'Linux' + shell: bash + run: curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash + - name: Upgrade Azure CLI on Windows + if: runner.os == 'Windows' + shell: pwsh + run: az upgrade --yes diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 473c3ee0e6..d0ff950abb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,17 +53,13 @@ jobs: env: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) - - name: Upgrade Azure CLI on Linux - if: matrix.os-name == 'Linux' && (matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues') - shell: bash - run: curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash - - name: Upgrade Azure CLI on Windows - if: matrix.os-name == 'Windows' && (matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues') - run: az upgrade --yes - name: Checkout uses: actions/checkout@v7.0.1 with: fetch-depth: 0 + - name: Upgrade Azure CLI + if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' + uses: ./.github/actions/upgrade-azure-cli - name: Move NuGet caches to the temp drive uses: ./.github/actions/nuget-cache-location - name: Setup .NET SDK diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index 870afde4b2..bf2b77f955 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -49,13 +49,13 @@ jobs: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} shell: pwsh run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) - - name: Upgrade Azure CLI - if: matrix.name == 'asb' || matrix.name == 'asq' - run: curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash - name: Checkout uses: actions/checkout@v7.0.1 with: fetch-depth: 0 + - name: Upgrade Azure CLI + if: matrix.name == 'asb' || matrix.name == 'asq' + uses: ./.github/actions/upgrade-azure-cli - name: Setup .NET SDK uses: actions/setup-dotnet@v6.0.0 with: