Skip to content

Commit 76767ed

Browse files
authored
Merge pull request desktop#21786 from desktop/testing-signing
2 parents 47ead1c + 47bfd5c commit 76767ed

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ on:
2828
secrets:
2929
AZURE_CODE_SIGNING_TENANT_ID:
3030
AZURE_CODE_SIGNING_CLIENT_ID:
31-
AZURE_CODE_SIGNING_CLIENT_SECRET:
3231
DESKTOP_OAUTH_CLIENT_ID:
3332
DESKTOP_OAUTH_CLIENT_SECRET:
3433
APPLE_ID:
@@ -69,6 +68,7 @@ jobs:
6968
runs-on: ${{ matrix.os }}
7069
permissions:
7170
contents: read
71+
id-token: write
7272
strategy:
7373
fail-fast: false
7474
matrix:
@@ -142,13 +142,19 @@ jobs:
142142
Expand-Archive $acsZip -Destination $acsDir -Force -Verbose
143143
# Replace ancient signtool in electron-winstall with one that supports ACS
144144
Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose
145+
- name: Azure Login (OIDC)
146+
if: ${{ runner.os == 'Windows' && inputs.sign }}
147+
uses: azure/login@v2
148+
with:
149+
client-id: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
150+
tenant-id: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
151+
allow-no-subscriptions: true
145152
- name: Package production app
146153
run: yarn package
147154
env:
148155
npm_config_arch: ${{ matrix.arch }}
149156
AZURE_TENANT_ID: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
150157
AZURE_CLIENT_ID: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
151-
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_SECRET }}
152158
- name: Upload artifacts
153159
uses: actions/upload-artifact@v4
154160
if: ${{ inputs.upload-artifacts }}

0 commit comments

Comments
 (0)