@@ -60,22 +60,14 @@ outputs:
6060 description : Version
6161 value : ${{ steps.get-version.outputs.version-type }}
6262
63- env :
64- AZDO_ORG : ${{ inputs.azdo-org }}
65- AZDO_PIPELINE_NAME : ${{ inputs.azdo-pipeline-name }}
66- AZDO_PROJECT : ${{ inputs.azdo-project }}
67- AZURE_CLIENT_ID : ${{ inputs.azure-client-id }}
68- AZURE_SUBSCRIPTION_ID : ${{ inputs.azure-subscription-id }}
69- AZURE_TENANT_ID : ${{ inputs.azure-tenant-id }}
70-
7163runs :
7264 using : composite
7365 steps :
7466 - uses : azure/login@v2
7567 with :
7668 allow-no-subscriptions : true
77- client-id : ${{ env.AZURE_CLIENT_ID }}
78- tenant-id : ${{ env.AZURE_TENANT_ID }}
69+ client-id : ${{ inputs.azure-client-id }}
70+ tenant-id : ${{ inputs.azure-tenant-id }}
7971
8072 # - id: run-pipeline
8173 # uses: azure/cli@v2
@@ -137,7 +129,14 @@ runs:
137129 INTERVAL=5
138130
139131 while [ $ELAPSED -lt $TIMEOUT ]; do
140- OUTPUT=$(az pipelines runs show --id "$RUN_ID" --org ${{ env.AZDO_ORG }} --project ${{ env.AZDO_PROJECT }} --detect false --output json)
132+ OUTPUT=$(
133+ az pipelines runs show \
134+ --id "$RUN_ID" \
135+ --org ${{ inputs.azdo-org }} \
136+ --project ${{ inputs.azdo-project }} \
137+ --detect false \
138+ --output json
139+ )
141140 STATUS=$(echo "$OUTPUT" | jq -r '.status')
142141
143142 if [ -z "$STATUS" ] || [ "$STATUS" = "null" ]; then
@@ -192,9 +191,9 @@ runs:
192191 az pipelines runs artifact download \
193192 --artifact-name "drop_build_main" \
194193 --detect false \
195- --org ${{ env.AZDO_ORG }} \
194+ --org ${{ inputs.azdo-org }} \
196195 --path "$GITHUB_WORKSPACE/artifact-download/" \
197- --project ${{ env.AZDO_PROJECT }} \
196+ --project ${{ inputs.azdo-project }} \
198197 --run-id "$RUN_ID"
199198
200199 # Verify artifact was downloaded
0 commit comments