Skip to content

Commit 2c7ef6f

Browse files
committed
Another try
1 parent 1f0f75b commit 2c7ef6f

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

ci/release.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ stages:
136136
workingDirectory: $(Build.BinariesDirectory)
137137
138138
- task: AzureCLI@2
139-
displayName: 'Azure CLI'
139+
displayName: 'Azure Login (1/2)'
140140
inputs:
141141
azureSubscription: 'Python Signing'
142142
scriptType: 'ps'
@@ -145,11 +145,16 @@ stages:
145145
"##vso[task.setvariable variable=AZURE_CLIENT_ID;issecret=true]$servicePrincipalId"
146146
"##vso[task.setvariable variable=AZURE_ID_TOKEN;issecret=true]$idToken"
147147
"##vso[task.setvariable variable=AZURE_TENANT_ID;issecret=true]$tenantId"
148-
$tokenPath = "$env:AGENT_TEMPDIRECTORY\federated-token.jwt"
149-
Set-Content -Path $tokenPath -Value $env:idToken
150-
Write-Host "##vso[task.setvariable variable=AZURE_FEDERATED_TOKEN_FILE]$tokenPath"
151148
addSpnToEnvironment: true
152149

150+
- powershell: >
151+
az login --service-principal
152+
-u $(AZURE_CLIENT_ID)
153+
--tenant $(AZURE_TENANT_ID)
154+
--allow-no-subscriptions
155+
--federated-token $(AZURE_ID_TOKEN)
156+
displayName: 'Azure Login (2/2)'
157+
153158
- powershell: |
154159
python make.py
155160
displayName: 'Build package'
@@ -170,10 +175,6 @@ stages:
170175
}
171176
displayName: 'Sign binaries'
172177
workingDirectory: $(LAYOUT_DIR)
173-
env:
174-
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
175-
AZURE_CLIENT_SECRET: $(AZURE_CLIENT_SECRET)
176-
AZURE_TENANT_ID: $(AZURE_TENANT_ID)
177178
178179
- powershell: |
179180
python make-msix.py
@@ -205,10 +206,6 @@ stages:
205206
}
206207
displayName: 'Sign MSIX package'
207208
workingDirectory: $(DIST_DIR)
208-
env:
209-
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
210-
AZURE_CLIENT_SECRET: $(AZURE_CLIENT_SECRET)
211-
AZURE_TENANT_ID: $(AZURE_TENANT_ID)
212209
213210
- powershell: >
214211
dir *.msi | %{
@@ -220,10 +217,6 @@ stages:
220217
}
221218
displayName: 'Sign MSI package'
222219
workingDirectory: $(DIST_DIR)
223-
env:
224-
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
225-
AZURE_CLIENT_SECRET: $(AZURE_CLIENT_SECRET)
226-
AZURE_TENANT_ID: $(AZURE_TENANT_ID)
227220
228221
- ${{ if eq(parameters.TestSign, 'true') }}:
229222
- powershell: Write-Host "##vso[build.addbuildtag]test-signed"

0 commit comments

Comments
 (0)