Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/actions/upgrade-azure-cli/action.yml
Original file line number Diff line number Diff line change
@@ -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
19 changes: 3 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ jobs:
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
Expand Down Expand Up @@ -96,22 +99,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: |
Expand Down
20 changes: 3 additions & 17 deletions .github/workflows/container-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,13 @@ jobs:
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:
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
Expand Down
Loading