Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5ed1158
build: bump the python-deps group in /src/backend with 27 updates
dependabot[bot] Mar 1, 2026
95a7d0d
build: bump the all-actions group with 8 updates
dependabot[bot] Mar 1, 2026
5727f8b
Standardize environment variable naming conventions
Prachig-Microsoft Mar 20, 2026
e2ea72e
Update .github/workflows/job-deploy-linux.yml
Prachig-Microsoft Mar 23, 2026
0511ef0
Update .github/workflows/job-deploy-windows.yml
Prachig-Microsoft Mar 23, 2026
e5b8c39
Update resource group creation command to include tags and fix exp pa…
Vamshi-Microsoft Mar 26, 2026
a0095aa
Add RG_TAGS environment variable to deployment workflow
Vamshi-Microsoft Mar 26, 2026
47bda0e
build: bump the python-deps group in /src/backend with 18 updates
dependabot[bot] Apr 1, 2026
76e15ae
build: bump the all-actions group with 5 updates
dependabot[bot] Apr 1, 2026
c5a014a
fix: correct secret name references in workflow files
Prachig-Microsoft Apr 7, 2026
1edb473
Standardize environment variable names - Updated parameter naming con…
Prachig-Microsoft Apr 9, 2026
fc27cbc
Merge remote-tracking branch 'origin/dev-v4' into feature/parameter-n…
Prachig-Microsoft Apr 9, 2026
5238268
build: bump the python-deps group in /src/backend with 16 updates
dependabot[bot] Apr 13, 2026
f72d22c
fix: use existing GitHub variable AZURE_AI_DEPLOYMENT_LOCATION for AZ…
Prachig-Microsoft Apr 14, 2026
de40f53
Fix: Revert secret names to match GitHub settings
Prachig-Microsoft Apr 15, 2026
eac52db
Merge remote-tracking branch 'origin/dev-v4' into dependabotchanges
Dhruvkumar-Microsoft Apr 16, 2026
62e873d
Enhance setup scripts to include '--extra dev' for dependency install…
Ayaz-Microsoft Apr 17, 2026
244273a
Standardize parameter names to match azd environment variables
Prachig-Microsoft Apr 17, 2026
d9de6e6
updated the dependabot packages
Dhruvkumar-Microsoft Apr 17, 2026
1e9f011
Merge origin/dev-v4 into feature/parameter-naming-standardization
Prachig-Microsoft Apr 17, 2026
6d577b1
refactor: Remove redundant nested if block in job-deploy-windows.yml
Prachig-Microsoft Apr 17, 2026
27e4ea6
fix: Rename AZURE_ENV_MODEL_CAPACITY to AZURE_ENV_GPT_MODEL_CAPACITY …
Prachig-Microsoft Apr 17, 2026
0d2132a
Merge pull request #935 from microsoft/dependabotFix-az
Roopan-Microsoft Apr 20, 2026
783f93d
feat: Add pytest coverage comment to PRs (dev-v4)
Rafi-Microsoft Apr 21, 2026
77b322b
fix: Restore demo-v4 branch in workflow triggers
Rafi-Microsoft Apr 21, 2026
768b2bc
Merge pull request #938 from microsoft/psl-add-coverage-pr-comment-v4
Roopan-Microsoft Apr 21, 2026
e92c2d0
feat: restrict backend Container App to private access in WAF deployment
Prajwal-Microsoft Apr 21, 2026
56a9beb
Merge pull request #941 from microsoft/psl-dependabotchanges-dk
Roopan-Microsoft Apr 21, 2026
3993825
Removed the bicep paramater
Dhruvkumar-Microsoft Apr 21, 2026
3d59f09
fix: add WebSocket proxy support for WAF mode
Prajwal-Microsoft Apr 21, 2026
2dfaea4
Merge pull request #943 from microsoft/main
Ritesh-Microsoft Apr 21, 2026
987c091
macae-v4-update
Ritesh-Microsoft Apr 21, 2026
53b4673
Merge branch 'dev-v4' of https://github.com/Ritesh-Microsoft/MACAE-v4…
Ritesh-Microsoft Apr 21, 2026
d08d709
Merge pull request #944 from Ritesh-Microsoft/dev-v4
Ritesh-Microsoft Apr 21, 2026
1812994
updated the broke links checker pipeline
Dhruvkumar-Microsoft Apr 21, 2026
d55955d
Update setupEnv.sh file frontend to App
NirajC-Microsoft Apr 21, 2026
ad68ef7
Merge pull request #945 from microsoft/psl-bug-40868
Roopan-Microsoft Apr 22, 2026
90bc18d
Merge pull request #942 from microsoft/feature/remove-bicep-version
Roopan-Microsoft Apr 22, 2026
22a8688
Merge pull request #939 from microsoft/feature/39249-waf-api-private-…
Roopan-Microsoft Apr 22, 2026
68e8a34
Merge pull request #867 from microsoft/feature/parameter-naming-stand…
Roopan-Microsoft Apr 23, 2026
33598dc
update the avm version and microsoft api version
Dhruvkumar-Microsoft Apr 23, 2026
e4374a1
Merge branch 'dev-v4' of https://github.com/microsoft/Multi-Agent-Cus…
Dhruvkumar-Microsoft Apr 23, 2026
372d763
Updated the copilot comments
Dhruvkumar-Microsoft Apr 23, 2026
9b24b00
ci: Add Azure login refresh steps for WAF deployments in Linux and Wi…
Harsh-Microsoft Apr 23, 2026
e60088d
Merge pull request #950 from microsoft/update-AVM-module
Roopan-Microsoft Apr 23, 2026
9755ee6
test: Update xpath locators & fix pipeline
Avijit-Microsoft Apr 23, 2026
e9cc694
Merge pull request #953 from microsoft/psl-hb-tk-41061
Roopan-Microsoft Apr 23, 2026
c577b39
updated the links to check broken link checker
Dhruvkumar-Microsoft Apr 23, 2026
56cc392
updated the document to resolve broken link issue
Dhruvkumar-Microsoft Apr 23, 2026
3d8dcdb
Merge pull request #954 from microsoft/psl-fixBrokenLinks-dk
Roopan-Microsoft Apr 23, 2026
c6a141c
updated the Docker File and copilot coomets
Dhruvkumar-Microsoft Apr 24, 2026
080f698
Merge pull request #956 from microsoft/psl-fixBrokenLinks-dk
Roopan-Microsoft Apr 24, 2026
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
4 changes: 2 additions & 2 deletions .devcontainer/setupEnv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ set -e

echo "Setting up Backend..."
cd ./src/backend
uv sync --frozen
uv sync --frozen --extra dev
cd ../../

echo "Setting up Frontend..."
cd ./src/frontend
cd ./src/App
npm install
pip install -r requirements.txt
cd ../../
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/agnext-biab-02-containerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch
type=sha
- name: Build and push Docker image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: agnext-biab-02/
file: agnext-biab-02/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/azd-template-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
AZURE_ENV_NAME: azd-${{ vars.AZURE_ENV_NAME }}-${{ env.HHMM }}
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
AZURE_ENV_OPENAI_LOCATION : ${{ vars.AZURE_AI_DEPLOYMENT_LOCATION }}
AZURE_ENV_MODEL_CAPACITY: 1
AZURE_ENV_AI_SERVICE_LOCATION: ${{ vars.AZURE_AI_DEPLOYMENT_LOCATION }}
AZURE_ENV_GPT_MODEL_CAPACITY: 1
AZURE_ENV_MODEL_4_1_CAPACITY: 1 # keep low to avoid potential quota issues
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/azure-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
AZURE_ENV_OPENAI_LOCATION : ${{ vars.AZURE_AI_DEPLOYMENT_LOCATION }}
AZURE_ENV_MODEL_CAPACITY: 1
AZURE_ENV_AI_SERVICE_LOCATION: ${{ vars.AZURE_AI_DEPLOYMENT_LOCATION }}
AZURE_ENV_GPT_MODEL_CAPACITY: 1
AZURE_ENV_MODEL_4_1_CAPACITY: 1
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
Expand Down Expand Up @@ -55,5 +55,5 @@ jobs:
azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt
fi
azd config set defaults.subscription "$AZURE_SUBSCRIPTION_ID"
azd env set AZURE_ENV_OPENAI_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_ENV_AI_SERVICE_LOCATION"
azd up --no-prompt
12 changes: 6 additions & 6 deletions .github/workflows/broken-links-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

# For PR : Get only changed markdown files
- name: Get changed markdown files (PR only)
id: changed-markdown-files
if: github.event_name == 'pull_request'
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 # v47.0.5
with:
files: |
**/*.md
Expand All @@ -34,10 +34,10 @@ jobs:
- name: Check Broken Links in Changed Markdown Files
id: lychee-check-pr
if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
uses: lycheeverse/lychee-action@v2.4.1
uses: lycheeverse/lychee-action@v2.8.0
with:
args: >
--verbose --exclude-mail --no-progress --exclude ^https?://
--verbose --no-progress --exclude ^https?://
${{ steps.changed-markdown-files.outputs.all_changed_files }}
failIfEmpty: false
env:
Expand All @@ -47,10 +47,10 @@ jobs:
- name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
id: lychee-check-manual
if: github.event_name == 'workflow_dispatch'
uses: lycheeverse/lychee-action@v2.4.1
uses: lycheeverse/lychee-action@v2.8.0
with:
args: >
--verbose --exclude-mail --no-progress --exclude ^https?://
--verbose --no-progress --exclude ^https?://
'**/*.md'
failIfEmpty: false
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.event.workflow_run.head_sha }}

- uses: codfish/semantic-release-action@v4
- uses: codfish/semantic-release-action@v5
id: semantic
with:
tag-format: 'v${version}'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-orchestrator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ on:
required: false
default: 'GoldenPath-Testing'
type: string
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
description: 'Log Analytics Workspace ID (Optional)'
required: false
default: ''
type: string
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
description: 'AI Project Resource ID (Optional)'
required: false
default: ''
Expand Down Expand Up @@ -86,8 +86,8 @@ jobs:
EXP: ${{ inputs.EXP }}
build_docker_image: ${{ inputs.build_docker_image }}
existing_webapp_url: ${{ inputs.existing_webapp_url }}
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
run_e2e_tests: ${{ inputs.run_e2e_tests }}
cleanup_resources: ${{ inputs.cleanup_resources }}
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
existing_webapp_url: ${{ inputs.existing_webapp_url }}
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
AZURE_LOCATION: ${{ needs.deploy.outputs.AZURE_LOCATION }}
AZURE_ENV_OPENAI_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_OPENAI_LOCATION }}
AZURE_ENV_AI_SERVICE_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
ENV_NAME: ${{ needs.deploy.outputs.ENV_NAME }}
IMAGE_TAG: ${{ needs.deploy.outputs.IMAGE_TAG }}
secrets: inherit
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/deploy-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ on:
- 'Smoke-Testing'
- 'None'

AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
description: 'Log Analytics Workspace ID (Optional)'
required: false
default: ''
type: string
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
description: 'AI Project Resource ID (Optional)'
required: false
default: ''
Expand All @@ -107,8 +107,8 @@ jobs:
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
azure_env_existing_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_existing_log_analytics_workspace_rid }}
azure_existing_aiproject_resource_id: ${{ steps.validate.outputs.azure_existing_aiproject_resource_id }}
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
steps:
- name: Validate Workflow Input Parameters
Expand All @@ -123,8 +123,8 @@ jobs:
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
run: |
echo "🔍 Validating workflow input parameters..."
Expand Down Expand Up @@ -214,32 +214,32 @@ jobs:
echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
fi

# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
VALIDATION_FAILED=true
else
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
fi
else
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
fi

# Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (optional, Azure Resource ID format)
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
echo "❌ ERROR: AZURE_EXISTING_AIPROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
echo " Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
VALIDATION_FAILED=true
else
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
fi
else
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Not provided (optional)"
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Not provided (optional)"
fi

# Validate existing_webapp_url (optional, must start with https)
Expand Down Expand Up @@ -274,8 +274,8 @@ jobs:
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
echo "azure_env_existing_log_analytics_workspace_rid=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
echo "azure_existing_aiproject_resource_id=$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT

Run:
Expand All @@ -291,8 +291,8 @@ jobs:
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.azure_env_existing_log_analytics_workspace_rid || '' }}
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_aiproject_resource_id || '' }}
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
trigger_type: ${{ github.event_name }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/deploy-waf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
GPT41_MINI_MIN_CAPACITY: 1
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Login to Azure
uses: azure/login@v2
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
solutionName=${{ env.SOLUTION_PREFIX }} \
location="${{ env.AZURE_LOCATION }}" \
azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
gptModelCapacity=${{ env.GPT_MIN_CAPACITY }} \
gptDeploymentCapacity=${{ env.GPT_MIN_CAPACITY }} \
gpt4_1ModelCapacity=${{ env.GPT41_MINI_MIN_CAPACITY }} \
gptReasoningModelCapacity=${{ env.O4_MINI_MIN_CAPACITY }} \
enableTelemetry=true \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
CONTAINER_APP: ${{steps.get_backend_url.outputs.CONTAINER_APP}}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Login to Azure
uses: azure/login@v2
Expand Down Expand Up @@ -138,13 +138,13 @@ jobs:
--parameters \
solutionName=${{ env.SOLUTION_PREFIX }} \
location="${{ env.AZURE_LOCATION }}" \
gptModelDeploymentType="GlobalStandard" \
deploymentType="GlobalStandard" \
gptModelName="gpt-4.1-mini" \
gptModelVersion="2025-04-14" \
backendContainerImageTag="${IMAGE_TAG}" \
frontendContainerImageTag="${IMAGE_TAG}" \
azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
gptModelCapacity=50 \
gptDeploymentCapacity=50 \
createdBy="Pipeline" \
tags="{'Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
--output json
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Login to Azure
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev-v4'|| github.ref_name == 'demo-v4' || github.ref_name == 'hotfix' }}
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
echo "HISTORICAL_TAG=${{ env.TAG }}_${DATE_TAG}_${RUN_ID}" >> $GITHUB_ENV

- name: Build and optionally push Backend Docker image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: ./src/backend
file: ./src/backend/Dockerfile
Expand All @@ -115,7 +115,7 @@ jobs:
${{ steps.registry.outputs.ext_registry }}/macaebackend:${{ env.HISTORICAL_TAG }}

- name: Build and optionally push Frontend Docker image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: ./src/App
file: ./src/App/Dockerfile
Expand All @@ -125,7 +125,7 @@ jobs:
${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.HISTORICAL_TAG }}

- name: Build and optionally push MCP Docker image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: ./src/mcp_server
file: ./src/mcp_server/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job-cleanup-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
description: 'Azure Location'
required: true
type: string
AZURE_ENV_OPENAI_LOCATION:
AZURE_ENV_AI_SERVICE_LOCATION:
description: 'Azure OpenAI Location'
required: true
type: string
Expand All @@ -50,7 +50,7 @@ jobs:
env:
RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
ENV_NAME: ${{ inputs.ENV_NAME }}
IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
steps:
Expand Down
Loading
Loading