Skip to content

Commit 95b8190

Browse files
authored
Work CI-CD (#2841)
***NO_CI***
1 parent 1a5ca06 commit 95b8190

File tree

2 files changed

+58
-55
lines changed

2 files changed

+58
-55
lines changed

azure-pipelines.yml

+58-41
Original file line numberDiff line numberDiff line change
@@ -794,9 +794,12 @@ jobs:
794794
vmImage: 'windows-latest'
795795

796796
variables:
797-
DOTNET_NOLOGO: true
797+
- group: sign-client-credentials
798+
- name: DOTNET_NOLOGO
799+
value: true
798800
# creates a counter and assigns it to the revision variable
799-
REVISION: $[counter('WIN32_1_9_0_versioncounter', 0)]
801+
- name: REVISION
802+
value: $[counter('WIN32_1_9_0_versioncounter', 0)]
800803

801804
steps:
802805
- template: azure-pipelines-templates/nb-gitversioning.yml
@@ -852,16 +855,19 @@ jobs:
852855
arguments: install --tool-path . SignClient
853856

854857
- pwsh: |
855-
.\SignClient "Sign" `
856-
--baseDirectory "$(Build.Repository.LocalPath)\build\bin\Release" `
857-
--input "**/nanoFramework.nanoCLR.*" `
858-
--config "$(Build.Repository.LocalPath)\config\SignClient.json" `
859-
--filelist "$(Build.Repository.LocalPath)\config\filelist.txt" `
860-
--user "$(SignClientUser)" `
861-
--secret '$(SignClientSecret)' `
862-
--name "nanoFramework.nanoCLR" `
858+
.\sign code azure-key-vault `
859+
"**/nanoFramework.nanoCLR.*" `
860+
--base-directory "$(Build.Repository.LocalPath)\build\bin\Release" `
861+
--file-list "$(Build.Repository.LocalPath)\config\filelist.txt" `
862+
--publisher-name ".NET nanoFramework" `
863863
--description "nanoFramework.nanoCLR" `
864-
--descriptionUrl "https://github.com/$env:Build_Repository_Name"
864+
--description-url "https://github.com/$env:Build_Repository_Name"
865+
--azure-key-vault-tenant-id "$(SignTenantId)"
866+
--azure-key-vault-client-id "$(SignClientId)"
867+
--azure-key-vault-client-secret "$(SignClientSecret)"
868+
--azure-key-vault-certificate "$(SignKeyVaultCertificate)"
869+
--azure-key-vault-url "$(SignKeyVaultUrl)"
870+
--timestamp-url http://timestamp.digicert.com
865871
displayName: Sign nanoCLR assemblies
866872
continueOnError: true
867873
condition: >-
@@ -911,16 +917,19 @@ jobs:
911917
ignoreMakeDirErrors: true
912918

913919
- pwsh: |
914-
.\SignClient "Sign" `
915-
--baseDirectory "$(Build.ArtifactStagingDirectory)" `
916-
--input "**/*.nupkg" `
917-
--config "$(Build.Repository.LocalPath)\config\SignClient.json" `
918-
--filelist "$(Build.Repository.LocalPath)\config\filelist.txt" `
919-
--user "$(SignClientUser)" `
920-
--secret '$(SignClientSecret)' `
921-
--name "nanoFramework.nanoCLR NuGets" `
920+
.\sign code azure-key-vault `
921+
"**/*.nupkg" `
922+
--base-directory "$(Build.Repository.LocalPath)\build\bin\Release" `
923+
--file-list "$(Build.Repository.LocalPath)\config\filelist.txt" `
924+
--publisher-name ".NET nanoFramework" `
922925
--description "nanoFramework.nanoCLR NuGets" `
923-
--descriptionUrl "https://github.com/$env:Build_Repository_Name"
926+
--description-url "https://github.com/$env:Build_Repository_Name"
927+
--azure-key-vault-tenant-id "$(SignTenantId)"
928+
--azure-key-vault-client-id "$(SignClientId)"
929+
--azure-key-vault-client-secret "$(SignClientSecret)"
930+
--azure-key-vault-certificate "$(SignKeyVaultCertificate)"
931+
--azure-key-vault-url "$(SignKeyVaultUrl)"
932+
--timestamp-url http://timestamp.digicert.com
924933
displayName: Sign packages
925934
continueOnError: true
926935
condition: >-
@@ -1010,8 +1019,10 @@ jobs:
10101019
vmImage: 'windows-latest'
10111020

10121021
variables:
1013-
DOTNET_NOLOGO: true
1014-
1022+
- group: sign-client-credentials
1023+
- name: DOTNET_NOLOGO
1024+
value: true
1025+
10151026
steps:
10161027
- template: azure-pipelines-templates/nb-gitversioning.yml
10171028

@@ -1046,19 +1057,22 @@ jobs:
10461057
inputs:
10471058
command: custom
10481059
custom: tool
1049-
arguments: install --tool-path . SignClient
1060+
arguments: install --tool-path . sign --version 0.9.1-beta.23530.1
10501061

10511062
- pwsh: |
1052-
.\SignClient "Sign" `
1053-
--baseDirectory "$(Build.Repository.LocalPath)\build\bin\Release" `
1054-
--input "**/nanoFramework.nanoCLR.*" `
1055-
--config "$(Build.Repository.LocalPath)\config\SignClient.json" `
1056-
--filelist "$(Build.Repository.LocalPath)\config\filelist.txt" `
1057-
--user "$(SignClientUser)" `
1058-
--secret '$(SignClientSecret)' `
1059-
--name "nanoFramework.nanoCLR.CLI" `
1063+
.\sign code azure-key-vault `
1064+
"**/nanoFramework.nanoCLR.*" `
1065+
--base-directory "$(Build.Repository.LocalPath)\build\bin\Release" `
1066+
--file-list "$(Build.Repository.LocalPath)\config\filelist.txt" `
1067+
--publisher-name ".NET nanoFramework" `
10601068
--description "nanoFramework.nanoCLR.CLI" `
1061-
--descriptionUrl "https://github.com/$env:Build_Repository_Name"
1069+
--description-url "https://github.com/$env:Build_Repository_Name"
1070+
--azure-key-vault-tenant-id "$(SignTenantId)"
1071+
--azure-key-vault-client-id "$(SignClientId)"
1072+
--azure-key-vault-client-secret "$(SignClientSecret)"
1073+
--azure-key-vault-certificate "$(SignKeyVaultCertificate)"
1074+
--azure-key-vault-url "$(SignKeyVaultUrl)"
1075+
--timestamp-url http://timestamp.digicert.com
10621076
displayName: Sign nanoCLR assemblies
10631077
continueOnError: true
10641078
condition: >-
@@ -1078,16 +1092,19 @@ jobs:
10781092
maximumCpuCount: true
10791093

10801094
- pwsh: |
1081-
.\SignClient "Sign" `
1082-
--baseDirectory "$(Build.ArtifactStagingDirectory)" `
1083-
--input "**/*.nupkg" `
1084-
--config "$(Build.Repository.LocalPath)\config\SignClient.json" `
1085-
--filelist "$(Build.Repository.LocalPath)\config\filelist.txt" `
1086-
--user "$(SignClientUser)" `
1087-
--secret '$(SignClientSecret)' `
1088-
--name "nanoFramework.nanoCLR.CLI NuGet" `
1095+
.\sign code azure-key-vault `
1096+
"**/*.nupkg" `
1097+
--base-directory "$(Build.Repository.LocalPath)\build\bin\Release" `
1098+
--file-list "$(Build.Repository.LocalPath)\config\filelist.txt" `
1099+
--publisher-name ".NET nanoFramework" `
10891100
--description "nanoFramework.nanoCLR.CLI NuGet" `
1090-
--descriptionUrl "https://github.com/$env:Build_Repository_Name"
1101+
--description-url "https://github.com/$env:Build_Repository_Name"
1102+
--azure-key-vault-tenant-id "$(SignTenantId)"
1103+
--azure-key-vault-client-id "$(SignClientId)"
1104+
--azure-key-vault-client-secret "$(SignClientSecret)"
1105+
--azure-key-vault-certificate "$(SignKeyVaultCertificate)"
1106+
--azure-key-vault-url "$(SignKeyVaultUrl)"
1107+
--timestamp-url http://timestamp.digicert.com
10911108
displayName: Sign packages
10921109
continueOnError: true
10931110
condition: >-

config/SignClient.json

-14
This file was deleted.

0 commit comments

Comments
 (0)