Skip to content

Commit b625b84

Browse files
committed
Adding support for signing the committed changes
1 parent f052859 commit b625b84

File tree

3 files changed

+51
-15
lines changed

3 files changed

+51
-15
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
configuration: [ debug, release ]
1616
os: [ windows ]
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
- run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }}
2020
shell: cmd
21-
- uses: actions/upload-artifact@v2
21+
- uses: actions/upload-artifact@v3
2222
with:
2323
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
2424
path: |
@@ -35,10 +35,10 @@ jobs:
3535
configuration: [ debug, release ]
3636
os: [ windows ]
3737
steps:
38-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v3
3939
- run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }} /p:PlatformTarget=${{ matrix.architecture }}
4040
shell: cmd
41-
- uses: actions/upload-artifact@v2
41+
- uses: actions/upload-artifact@v3
4242
with:
4343
name: ${{ matrix.os }}_${{ matrix.configuration }}_x86
4444
path: |
@@ -55,10 +55,10 @@ jobs:
5555
configuration: [ debug, release ]
5656
os: [ ubuntu ]
5757
steps:
58-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v3
5959
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
6060
shell: bash
61-
- uses: actions/upload-artifact@v2
61+
- uses: actions/upload-artifact@v3
6262
with:
6363
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
6464
path: |
@@ -75,10 +75,10 @@ jobs:
7575
configuration: [ debug, release ]
7676
os: [ macos ]
7777
steps:
78-
- uses: actions/checkout@v2
78+
- uses: actions/checkout@v3
7979
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
8080
shell: bash
81-
- uses: actions/upload-artifact@v2
81+
- uses: actions/upload-artifact@v3
8282
with:
8383
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
8484
path: |
@@ -90,13 +90,24 @@ jobs:
9090
build-nuget-preview:
9191
runs-on: windows-latest
9292
steps:
93-
- uses: actions/checkout@v2
93+
- uses: actions/checkout@v3
9494
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
9595
shell: cmd
9696
env:
9797
EXCLUDE_RUN_ID_FROM_PACKAGE: true
9898
EXCLUDE_SUFFIX_FROM_VERSION: false
99-
- uses: actions/upload-artifact@v2
99+
- uses: actions/setup-dotnet@v2
100+
if: ${{ github.event_name == 'push' }}
101+
with:
102+
dotnet-version: '6.0.x'
103+
env:
104+
SC_USER: ${{ secrets.SC_USER }}
105+
SC_PASS: ${{ secrets.SC_PASS }}
106+
- run: dotnet install --tool-path ./artifacts/tools SignClient
107+
if: ${{ github.event_name == 'push' }}
108+
- run: ./artifacts/tools/SignClient "Sign" --baseDirectory "./artifacts/pkg" --input "**/*.{nupkg}" --config "./scripts/SignClientSettings.json" --filelist "./scripts/SignClientFileList.txt" --user '$(SC_USER)' --secret '$(SC_PASS)' --name "ClangSharp" --description "ClangSharp" --descriptionUrl "https://github.com/dotnet/clangsharp"
109+
if: ${{ github.event_name == 'push' }}
110+
- uses: actions/upload-artifact@v3
100111
with:
101112
name: nuget_preview
102113
path: |
@@ -109,13 +120,24 @@ jobs:
109120
runs-on: windows-latest
110121
if: false
111122
steps:
112-
- uses: actions/checkout@v2
113-
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
123+
- uses: actions/checkout@v3
124+
- run: ./scripts/cibuild.cmd -configuration release -architecture x64 -sign
114125
shell: cmd
115126
env:
116127
EXCLUDE_RUN_ID_FROM_PACKAGE: true
117128
EXCLUDE_SUFFIX_FROM_VERSION: true
118-
- uses: actions/upload-artifact@v2
129+
- uses: actions/setup-dotnet@v2
130+
if: ${{ github.event_name == 'push' }}
131+
with:
132+
dotnet-version: '6.0.x'
133+
env:
134+
SC_USER: ${{ secrets.SC_USER }}
135+
SC_PASS: ${{ secrets.SC_PASS }}
136+
- run: dotnet install --tool-path ./artifacts/tools SignClient
137+
if: ${{ github.event_name == 'push' }}
138+
- run: ./artifacts/tools/SignClient "Sign" --baseDirectory "./artifacts/pkg" --input "**/*.{nupkg}" --config "./scripts/SignClientSettings.json" --filelist "./scripts/SignClientFileList.txt" --user '$(SC_USER)' --secret '$(SC_PASS)' --name "ClangSharp" --description "ClangSharp" --descriptionUrl "https://github.com/dotnet/clangsharp"
139+
if: ${{ github.event_name == 'push' }}
140+
- uses: actions/upload-artifact@v3
119141
with:
120142
name: nuget_release
121143
path: |
@@ -133,7 +155,7 @@ jobs:
133155
with:
134156
name: windows_release_x64
135157
path: ./artifacts
136-
- uses: actions/setup-dotnet@v1
158+
- uses: actions/setup-dotnet@v2
137159
with:
138160
dotnet-version: '6.0.x'
139161
source-url: https://pkgs.clangsharp.dev/index.json
@@ -149,7 +171,7 @@ jobs:
149171
with:
150172
name: windows_release_x64
151173
path: ./artifacts
152-
- uses: actions/setup-dotnet@v1
174+
- uses: actions/setup-dotnet@v2
153175
with:
154176
dotnet-version: '6.0.x'
155177
- run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/dotnet/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate

scripts/SignClientFileList.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/ClangSharp*

scripts/SignClientSettings.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"SignClient": {
3+
"AzureAd": {
4+
"AADInstance": "https://login.microsoftonline.com/",
5+
"ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
6+
"TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
7+
},
8+
"Service": {
9+
"Url": "https://codesign.dotnetfoundation.org/",
10+
"ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
11+
}
12+
}
13+
}

0 commit comments

Comments
 (0)