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
14 changes: 6 additions & 8 deletions .github/workflows/deploy-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@ on:
azure_location:
description: 'Azure Location For Deployment'
required: false
default: 'none'
default: 'australiaeast'
type: choice
options:
- 'none'
- 'australiaeast'
- 'eastus'
- 'centralus'
- 'eastasia'
- 'eastus2'
- 'francecentral'
- 'japaneast'
- 'swedencentral'
- 'northeurope'
- 'southeastasia'
- 'uksouth'
- 'westus'
- 'westus3'
resource_group_name:
description: 'Resource Group Name (Optional)'
required: false
Expand Down Expand Up @@ -76,7 +74,7 @@ jobs:
uses: ./.github/workflows/deploy-orchestrator.yml
with:
runner_os: ubuntu-latest
azure_location: ${{ github.event.inputs.azure_location }}
azure_location: ${{ github.event.inputs.azure_location || 'australiaeast' }}
resource_group_name: ${{ github.event.inputs.resource_group_name || '' }}
waf_enabled: ${{ github.event.inputs.waf_enabled == 'true' }}
exp: ${{ github.event.inputs.exp == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-orchestrator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
azure_location:
description: 'Azure Location For Deployment'
required: false
default: ''
default: 'australiaeast'
type: string
resource_group_name:
description: 'Resource Group Name (Optional)'
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/deploy-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@ on:
azure_location:
description: 'Azure Location For Deployment'
required: false
default: 'none'
default: 'australiaeast'
type: choice
options:
- 'none'
- 'australiaeast'
- 'eastus'
- 'centralus'
- 'eastasia'
- 'eastus2'
- 'francecentral'
- 'japaneast'
- 'swedencentral'
- 'northeurope'
- 'southeastasia'
- 'uksouth'
- 'westus'
- 'westus3'
resource_group_name:
description: 'Resource Group Name (Optional)'
required: false
Expand Down Expand Up @@ -76,7 +74,7 @@ jobs:
uses: ./.github/workflows/deploy-orchestrator.yml
with:
runner_os: windows-latest
azure_location: ${{ github.event.inputs.azure_location }}
azure_location: ${{ github.event.inputs.azure_location || 'australiaeast' }}
resource_group_name: ${{ github.event.inputs.resource_group_name || '' }}
waf_enabled: ${{ github.event.inputs.waf_enabled == 'true' }}
exp: ${{ github.event.inputs.exp == 'true' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/job-azure-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
azure_location:
description: 'Azure Location For Deployment'
required: false
default: ''
default: 'australiaeast'
type: string
resource_group_name:
description: 'Resource Group Name (Optional)'
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
export TEXT_EMBEDDING_MIN_CAPACITY=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
export AZURE_REGIONS="${{ inputs.azure_location || vars.AZURE_REGIONS }}"
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"

chmod +x infra/scripts/checkquota_km.sh
if ! infra/scripts/checkquota_km.sh; then
Expand All @@ -185,7 +185,7 @@ jobs:
echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_ENV
echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_OUTPUT

if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "${{ inputs.azure_location }}" && "${{ inputs.azure_location }}" != "none" ]]; then
if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "${{ inputs.azure_location }}" ]]; then
USER_SELECTED_LOCATION="${{ inputs.azure_location }}"
echo "Using user-selected Azure location: $USER_SELECTED_LOCATION"
echo "AZURE_LOCATION=$USER_SELECTED_LOCATION" >> $GITHUB_ENV
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
echo "| **Cleanup Resources** | ${{ env.CLEANUP_RESOURCES == 'true' && '✅ Yes' || '❌ No' }} |" >> $GITHUB_STEP_SUMMARY
echo "| **Build Docker Image** | ${{ env.BUILD_DOCKER_IMAGE == 'true' && '✅ Yes' || '❌ No' }} |" >> $GITHUB_STEP_SUMMARY

if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "${{ inputs.azure_location }}" && "${{ inputs.azure_location }}" != "none" ]]; then
if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "${{ inputs.azure_location }}" ]]; then
echo "| **Azure Location** | \`${{ inputs.azure_location }}\` (User Selected) |" >> $GITHUB_STEP_SUMMARY
fi

Expand Down
Loading