|
98 | 98 | CLEANUP_RESOURCES: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.cleanup_resources || true) || true }} |
99 | 99 | RUN_E2E_TESTS: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.run_e2e_tests || 'GoldenPath-Testing') || 'GoldenPath-Testing' }} |
100 | 100 | BUILD_DOCKER_IMAGE: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.build_docker_image || false) || false }} |
| 101 | + AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }} |
101 | 102 |
|
102 | 103 | jobs: |
103 | 104 | display-configuration: |
@@ -147,14 +148,10 @@ jobs: |
147 | 148 | |
148 | 149 | if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "${{ inputs.azure_location }}" ]]; then |
149 | 150 | echo "| **Azure Location** | \`${{ inputs.azure_location }}\` (User Selected) |" >> $GITHUB_STEP_SUMMARY |
150 | | - else |
151 | | - echo "| **Azure Location** | Will be determined by quota check |" >> $GITHUB_STEP_SUMMARY |
152 | 151 | fi |
153 | 152 | |
154 | 153 | if [[ -n "${{ inputs.resource_group_name }}" ]]; then |
155 | 154 | echo "| **Resource Group** | \`${{ inputs.resource_group_name }}\` (Pre-specified) |" >> $GITHUB_STEP_SUMMARY |
156 | | - else |
157 | | - echo "| **Resource Group** | Will be auto-generated |" >> $GITHUB_STEP_SUMMARY |
158 | 155 | fi |
159 | 156 | fi |
160 | 157 | |
@@ -290,6 +287,7 @@ jobs: |
290 | 287 | WAF_ENABLED: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.waf_enabled || false) || false }} |
291 | 288 | EXP: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.EXP || false) || false }} |
292 | 289 | CLEANUP_RESOURCES: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.cleanup_resources || true) || true }} |
| 290 | + AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }} |
293 | 291 |
|
294 | 292 | steps: |
295 | 293 | - name: Validate and Auto-Configure EXP |
@@ -563,7 +561,6 @@ jobs: |
563 | 561 | azd env set AZURE_LOCATION="$AZURE_LOCATION" |
564 | 562 | azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME" |
565 | 563 | azd env set AZURE_ENV_CONTAINER_IMAGE_TAG="${{ steps.determine_image_tag.outputs.IMAGE_TAG }}" |
566 | | - azd env set AZURE_DEV_COLLECT_TELEMETRY="${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}" |
567 | 564 | |
568 | 565 | if [[ "${{ env.BUILD_DOCKER_IMAGE }}" == "true" ]]; then |
569 | 566 | ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" ) |
@@ -647,7 +644,6 @@ jobs: |
647 | 644 | azd env set AZURE_LOCATION="$env:AZURE_LOCATION" |
648 | 645 | azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME" |
649 | 646 | azd env set AZURE_ENV_CONTAINER_IMAGE_TAG="${{ steps.determine_image_tag.outputs.IMAGE_TAG }}" |
650 | | - azd env set AZURE_DEV_COLLECT_TELEMETRY="${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}" |
651 | 647 | # Set ACR name only when building Docker image |
652 | 648 | if ("${{ env.BUILD_DOCKER_IMAGE }}" -eq "true") { |
653 | 649 | # Extract ACR name from login server and set as environment variable |
|
0 commit comments