Skip to content

Commit 217efe2

Browse files
committed
Moved the signing to a single step.
1 parent fabf51d commit 217efe2

File tree

1 file changed

+28
-61
lines changed

1 file changed

+28
-61
lines changed

.github/workflows/main.yml

Lines changed: 28 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,6 @@ jobs:
160160
name: Windows (${{matrix.quantumName}}, ${{matrix.platformName}})
161161
runs-on: windows-2022
162162

163-
permissions:
164-
id-token: write
165-
contents: read
166-
packages: read
167-
168163
strategy:
169164
fail-fast: false
170165
matrix:
@@ -222,24 +217,6 @@ jobs:
222217
run: ./publish.cmd ${{ matrix.quantumName }} "${{ matrix.platformName }}"
223218
working-directory: publish
224219

225-
- name: Azure CLI login with federated credential
226-
if: github.event_name != 'pull_request'
227-
uses: azure/login@v2
228-
with:
229-
client-id: ${{ secrets.AZURE_CLIENT_ID }}
230-
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
231-
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
232-
233-
- name: Sign NuGet package
234-
if: ${{ github.event_name != 'pull_request' }}
235-
run: sign code trusted-signing *.nupkg `
236-
--trusted-signing-account ImageMagick `
237-
--trusted-signing-certificate-profile ImageMagick `
238-
--trusted-signing-endpoint https://eus.codesigning.azure.net `
239-
--azure-credential-type azure-cli `
240-
--verbosity information
241-
working-directory: publish/output
242-
243220
- name: Upload library
244221
uses: actions/upload-artifact@v5
245222
with:
@@ -251,11 +228,6 @@ jobs:
251228
#runs-on: windows-11-arm
252229
runs-on: windows-2022
253230

254-
permissions:
255-
id-token: write
256-
contents: read
257-
packages: read
258-
259231
strategy:
260232
fail-fast: false
261233
matrix:
@@ -300,25 +272,6 @@ jobs:
300272
run: ./publish.cmd ${{ matrix.quantumName }} "${{ matrix.platformName }}"
301273
working-directory: publish
302274

303-
- name: Azure CLI login with federated credential
304-
if: github.event_name != 'pull_request'
305-
uses: azure/login@v2
306-
with:
307-
client-id: ${{ secrets.AZURE_CLIENT_ID }}
308-
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
309-
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
310-
311-
- name: Sign NuGet package
312-
if: ${{ github.event_name != 'pull_request' }}
313-
run: sign code trusted-signing `
314-
--trusted-signing-account ImageMagick `
315-
--trusted-signing-certificate-profile ImageMagick `
316-
--trusted-signing-endpoint https://eus.codesigning.azure.net `
317-
--azure-credential-type azure-cli `
318-
--verbosity information `
319-
*.nupkg
320-
working-directory: publish/output
321-
322275
- name: Upload library
323276
uses: actions/upload-artifact@v5
324277
with:
@@ -329,11 +282,6 @@ jobs:
329282
name: Library
330283
runs-on: windows-2022
331284

332-
permissions:
333-
id-token: write
334-
contents: read
335-
packages: read
336-
337285
strategy:
338286
fail-fast: false
339287
matrix:
@@ -369,27 +317,46 @@ jobs:
369317
run: ./publish.library.cmd "Magick.NET.${{ matrix.libraryName }}"
370318
working-directory: publish
371319

320+
- name: Upload library
321+
uses: actions/upload-artifact@v5
322+
with:
323+
name: Magick.NET.${{ matrix.libraryName }}
324+
path: publish/output
325+
326+
sign:
327+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
328+
name: Sign NuGet packages
329+
needs:
330+
- windows
331+
- windows_arm64
332+
- libraries
333+
runs-on: windows-2022
334+
335+
permissions:
336+
id-token: write
337+
contents: read
338+
packages: read
339+
340+
steps:
341+
- name: Download artifacts
342+
uses: actions/download-artifact@v6
343+
with:
344+
path: packages
345+
merge-multiple: true
346+
372347
- name: Azure CLI login with federated credential
373-
if: github.event_name != 'pull_request'
374348
uses: azure/login@v2
375349
with:
376350
client-id: ${{ secrets.AZURE_CLIENT_ID }}
377351
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
378352
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
379353

380354
- name: Sign NuGet package
381-
if: ${{ github.event_name != 'pull_request' }}
382355
run: sign code trusted-signing `
383356
--trusted-signing-account ImageMagick `
384357
--trusted-signing-certificate-profile ImageMagick `
385358
--trusted-signing-endpoint https://eus.codesigning.azure.net `
386359
--azure-credential-type azure-cli `
387360
--verbosity information `
388361
*.nupkg
389-
working-directory: publish/output
390-
391-
- name: Upload library
392-
uses: actions/upload-artifact@v5
393-
with:
394-
name: Magick.NET.${{ matrix.libraryName }}
395-
path: publish/output
362+
working-directory: packages

0 commit comments

Comments
 (0)