Skip to content

Commit c51c9d5

Browse files
remove config
1 parent 1c8a1ad commit c51c9d5

3 files changed

Lines changed: 53 additions & 154 deletions

File tree

.github/workflows/deploy-orchestrator.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -94,24 +94,7 @@ env:
9494
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
9595

9696
jobs:
97-
display-configuration:
98-
uses: ./.github/workflows/job-display-configuration.yml
99-
with:
100-
trigger_type: ${{ inputs.trigger_type }}
101-
runner_os: ${{ inputs.runner_os }}
102-
waf_enabled: ${{ inputs.waf_enabled }}
103-
EXP: ${{ inputs.EXP }}
104-
build_docker_image: ${{ inputs.build_docker_image }}
105-
cleanup_resources: ${{ inputs.cleanup_resources }}
106-
run_e2e_tests: ${{ inputs.run_e2e_tests }}
107-
azure_location: ${{ inputs.azure_location }}
108-
resource_group_name: ${{ inputs.resource_group_name }}
109-
existing_webapp_url: ${{ inputs.existing_webapp_url }}
110-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
111-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
112-
11397
docker-build:
114-
needs: display-configuration
11598
uses: ./.github/workflows/job-docker-build.yml
11699
with:
117100
trigger_type: ${{ inputs.trigger_type }}
@@ -123,7 +106,7 @@ jobs:
123106

124107
deploy:
125108
if: always() && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)
126-
needs: [display-configuration, docker-build]
109+
needs: docker-build
127110
uses: ./.github/workflows/job-deploy.yml
128111
with:
129112
trigger_type: ${{ inputs.trigger_type }}

.github/workflows/job-deploy.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ on:
3636
required: false
3737
default: false
3838
type: boolean
39+
cleanup_resources:
40+
description: 'Cleanup Deployed Resources'
41+
required: false
42+
default: false
43+
type: boolean
44+
run_e2e_tests:
45+
description: 'Run End-to-End Tests'
46+
required: false
47+
default: 'GoldenPath-Testing'
48+
type: string
3949
existing_webapp_url:
4050
description: 'Existing Container WebApp URL (Skips Deployment)'
4151
required: false
@@ -105,6 +115,8 @@ env:
105115
BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
106116
WAF_ENABLED: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.waf_enabled || false) || false }}
107117
EXP: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.EXP || false) || false }}
118+
CLEANUP_RESOURCES: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.cleanup_resources || true) || true }}
119+
RUN_E2E_TESTS: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.run_e2e_tests || 'GoldenPath-Testing') || 'GoldenPath-Testing' }}
108120
BUILD_DOCKER_IMAGE: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.build_docker_image || false) || false }}
109121

110122
jobs:
@@ -344,6 +356,46 @@ jobs:
344356
fi
345357
fi
346358
359+
- name: Display Workflow Configuration to GitHub Summary
360+
shell: bash
361+
run: |
362+
echo "## 📋 Workflow Configuration Summary" >> $GITHUB_STEP_SUMMARY
363+
echo "" >> $GITHUB_STEP_SUMMARY
364+
echo "| Configuration | Value |" >> $GITHUB_STEP_SUMMARY
365+
echo "|---------------|-------|" >> $GITHUB_STEP_SUMMARY
366+
367+
if [[ "${{ inputs.existing_webapp_url }}" != "" ]]; then
368+
echo "| **Existing WebApp URL (Skips Deployment)** | [${{ inputs.existing_webapp_url }}](${{ inputs.existing_webapp_url }}) |" >> $GITHUB_STEP_SUMMARY
369+
echo "| **Run E2E Tests** | \`${{ env.RUN_E2E_TESTS }}\` |" >> $GITHUB_STEP_SUMMARY
370+
else
371+
echo "| **Trigger Type** | \`${{ github.event_name }}\` |" >> $GITHUB_STEP_SUMMARY
372+
echo "| **Branch** | \`${{ env.BRANCH_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
373+
echo "| **Runner OS** | \`${{ inputs.runner_os }}\` |" >> $GITHUB_STEP_SUMMARY
374+
echo "| **WAF Enabled** | ${{ env.WAF_ENABLED == 'true' && '✅ Yes' || '❌ No' }} |" >> $GITHUB_STEP_SUMMARY
375+
echo "| **EXP Enabled** | ${{ env.EXP == 'true' && '✅ Yes' || '❌ No' }} |" >> $GITHUB_STEP_SUMMARY
376+
echo "| **Run E2E Tests** | \`${{ env.RUN_E2E_TESTS }}\` |" >> $GITHUB_STEP_SUMMARY
377+
echo "| **Cleanup Resources** | ${{ env.CLEANUP_RESOURCES == 'true' && '✅ Yes' || '❌ No' }} |" >> $GITHUB_STEP_SUMMARY
378+
echo "| **Build Docker Image** | ${{ env.BUILD_DOCKER_IMAGE == 'true' && '✅ Yes' || '❌ No' }} |" >> $GITHUB_STEP_SUMMARY
379+
380+
if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "${{ inputs.azure_location }}" ]]; then
381+
echo "| **Azure Location** | \`${{ inputs.azure_location }}\` (User Selected) |" >> $GITHUB_STEP_SUMMARY
382+
fi
383+
384+
if [[ -n "${{ inputs.resource_group_name }}" ]]; then
385+
echo "| **Resource Group** | \`${{ inputs.resource_group_name }}\` (Pre-specified) |" >> $GITHUB_STEP_SUMMARY
386+
fi
387+
fi
388+
389+
echo "" >> $GITHUB_STEP_SUMMARY
390+
391+
if [[ "${{ inputs.existing_webapp_url }}" == "" ]]; then
392+
if [[ "${{ inputs.trigger_type }}" != "workflow_dispatch" ]]; then
393+
echo "ℹ️ **Note:** Automatic Trigger - Using Non-WAF + Non-EXP configuration" >> $GITHUB_STEP_SUMMARY
394+
else
395+
echo "ℹ️ **Note:** Manual Trigger - Using user-specified configuration" >> $GITHUB_STEP_SUMMARY
396+
fi
397+
fi
398+
347399
deploy-linux:
348400
name: Deploy on Linux
349401
needs: azure-setup

.github/workflows/job-display-configuration.yml

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)