Skip to content

Commit 52e8352

Browse files
damianhdamianh
committed
Remove build projects
Use crt in workflows directory
1 parent f59375b commit 52e8352

22 files changed

+33
-749
lines changed

‎.github/workflow-gen/Program.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ public static void StepTestAndReport(this Job job, string componentName, string
188188
.Name("Test")
189189
.Run($"dotnet test -c Release {path} {flags}");
190190

191-
job.Step("test-report")
192-
.Name("Test report")
191+
job.Step()
192+
.Name($"Test report - {componentName}")
193193
.Uses("dorny/test-reporter@v1")
194194
.If("success() || failure()")
195195
.With(
@@ -200,29 +200,31 @@ public static void StepTestAndReport(this Job job, string componentName, string
200200
("fail-on-empty", "true"));
201201
}
202202

203+
// These intermediate certificates are required for signing and are not installed on the GitHub runners by default.
203204
public static void StepInstallCACerts(this Job job)
204205
=> job.Step()
205-
.Name("Install Sectigo CodeSiging CA certificates")
206-
.IfRefMain()
206+
.Name("Install Sectigo CodeSiging CA certificates")
207+
.WorkingDirectory("github/workflows")
208+
//.IfRefMain()
207209
.Run("""
208210
sudo apt-get update
209211
sudo apt-get install -y ca-certificates
210-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
212+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
211213
sudo update-ca-certificates
212214
""");
213215

214216
public static void StepToolRestore(this Job job)
215217
=> job.Step()
216218
.Name("Tool restore")
217-
.IfRefMain()
219+
//.IfRefMain()
218220
.Run("dotnet tool restore");
219221

220222
public static void StepPack(this Job job, string componentName, string project)
221223
{
222224
var path = $"{componentName}/src/{project}";
223225
job.Step()
224226
.Name($"Pack {project}")
225-
.IfRefMain()
227+
//.IfRefMain()
226228
.Run($"dotnet pack -c Release {path} --no-build -o artifacts");
227229
}
228230

@@ -237,7 +239,7 @@ public static void StepSign(this Job job)
237239
"--azure-key-vault-certificate CodeSigning";
238240
job.Step()
239241
.Name("Sign packages")
240-
.IfRefMain()
242+
//.IfRefMain()
241243
.Run($"""
242244
for file in artifacts/*.nupkg; do
243245
dotnet NuGetKeyVaultSignTool sign \"$file\" {flags}

‎access-token-management/build/SectigoPublicCodeSigningRootCrossAAA.crt renamed to ‎.github/workflows/SectigoPublicCodeSigningRootCrossAAA.crt

File renamed without changes.

‎.github/workflows/access-token-management-ci.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
dotnet-version: 8.0.x
3434
- name: Test
3535
run: dotnet test -c Release test/AccessTokenManagement.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
36-
- id: test-report
37-
name: Test report
36+
- name: Test report - access-token-management
3837
if: success() || failure()
3938
uses: dorny/test-reporter@v1
4039
with:
@@ -44,23 +43,19 @@ jobs:
4443
fail-on-error: true
4544
fail-on-empty: true
4645
- name: Install Sectigo CodeSiging CA certificates
47-
if: github.ref == 'refs/heads/main'
4846
run: |-
4947
sudo apt-get update
5048
sudo apt-get install -y ca-certificates
51-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
49+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
5250
sudo update-ca-certificates
51+
working-directory: github/workflows
5352
- name: Tool restore
54-
if: github.ref == 'refs/heads/main'
5553
run: dotnet tool restore
5654
- name: Pack AccessTokenManagement
57-
if: github.ref == 'refs/heads/main'
5855
run: dotnet pack -c Release access-token-management/src/AccessTokenManagement --no-build -o artifacts
5956
- name: Pack AccessTokenManagement.OpenIdConnect
60-
if: github.ref == 'refs/heads/main'
6157
run: dotnet pack -c Release access-token-management/src/AccessTokenManagement.OpenIdConnect --no-build -o artifacts
6258
- name: Sign packages
63-
if: github.ref == 'refs/heads/main'
6459
run: |-
6560
for file in artifacts/*.nupkg; do
6661
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

‎.github/workflows/access-token-management-release.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,17 @@ jobs:
3939
git tag -a it-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
4040
git push origin it-${{ github.event.inputs.version }}
4141
- name: Install Sectigo CodeSiging CA certificates
42-
if: github.ref == 'refs/heads/main'
4342
run: |-
4443
sudo apt-get update
4544
sudo apt-get install -y ca-certificates
46-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
45+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
4746
sudo update-ca-certificates
47+
working-directory: github/workflows
4848
- name: Pack AccessTokenManagement
49-
if: github.ref == 'refs/heads/main'
5049
run: dotnet pack -c Release access-token-management/src/AccessTokenManagement --no-build -o artifacts
5150
- name: Pack AccessTokenManagement.OpenIdConnect
52-
if: github.ref == 'refs/heads/main'
5351
run: dotnet pack -c Release access-token-management/src/AccessTokenManagement.OpenIdConnect --no-build -o artifacts
5452
- name: Sign packages
55-
if: github.ref == 'refs/heads/main'
5653
run: |-
5754
for file in artifacts/*.nupkg; do
5855
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

‎.github/workflows/identity-model-ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
dotnet-version: 8.0.x
3434
- name: Test
3535
run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
36-
- id: test-report
37-
name: Test report
36+
- name: Test report - identity-model
3837
if: success() || failure()
3938
uses: dorny/test-reporter@v1
4039
with:
@@ -44,20 +43,17 @@ jobs:
4443
fail-on-error: true
4544
fail-on-empty: true
4645
- name: Install Sectigo CodeSiging CA certificates
47-
if: github.ref == 'refs/heads/main'
4846
run: |-
4947
sudo apt-get update
5048
sudo apt-get install -y ca-certificates
51-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
49+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
5250
sudo update-ca-certificates
51+
working-directory: github/workflows
5352
- name: Tool restore
54-
if: github.ref == 'refs/heads/main'
5553
run: dotnet tool restore
5654
- name: Pack IdentityModel
57-
if: github.ref == 'refs/heads/main'
5855
run: dotnet pack -c Release identity-model/src/IdentityModel --no-build -o artifacts
5956
- name: Sign packages
60-
if: github.ref == 'refs/heads/main'
6157
run: |-
6258
for file in artifacts/*.nupkg; do
6359
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

‎.github/workflows/identity-model-odic-client-release.yml

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎.github/workflows/identity-model-oidc-client-ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
dotnet-version: 8.0.x
3434
- name: Test
3535
run: dotnet test -c Release test/IdentityModel.OidcClient.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
36-
- id: test-report
37-
name: Test report
36+
- name: Test report - identity-model-oidc-client
3837
if: success() || failure()
3938
uses: dorny/test-reporter@v1
4039
with:
@@ -45,8 +44,7 @@ jobs:
4544
fail-on-empty: true
4645
- name: Test
4746
run: dotnet test -c Release test/IdentityModel.OidcClient.DPoP.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
48-
- id: test-report
49-
name: Test report
47+
- name: Test report - identity-model-oidc-client
5048
if: success() || failure()
5149
uses: dorny/test-reporter@v1
5250
with:
@@ -57,8 +55,7 @@ jobs:
5755
fail-on-empty: true
5856
- name: Test
5957
run: dotnet test -c Release test/IdentityModel.OidcClient.IdentityTokenValidator.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
60-
- id: test-report
61-
name: Test report
58+
- name: Test report - identity-model-oidc-client
6259
if: success() || failure()
6360
uses: dorny/test-reporter@v1
6461
with:
@@ -68,26 +65,21 @@ jobs:
6865
fail-on-error: true
6966
fail-on-empty: true
7067
- name: Install Sectigo CodeSiging CA certificates
71-
if: github.ref == 'refs/heads/main'
7268
run: |-
7369
sudo apt-get update
7470
sudo apt-get install -y ca-certificates
75-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
71+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
7672
sudo update-ca-certificates
73+
working-directory: github/workflows
7774
- name: Tool restore
78-
if: github.ref == 'refs/heads/main'
7975
run: dotnet tool restore
8076
- name: Pack IdentityModel.OidcClient
81-
if: github.ref == 'refs/heads/main'
8277
run: dotnet pack -c Release identity-model-oidc-client/src/IdentityModel.OidcClient --no-build -o artifacts
8378
- name: Pack IdentityModel.OidcClient.DPoP
84-
if: github.ref == 'refs/heads/main'
8579
run: dotnet pack -c Release identity-model-oidc-client/src/IdentityModel.OidcClient.DPoP --no-build -o artifacts
8680
- name: Pack IdentityModel.OidcClient.IdentityTokenValidator
87-
if: github.ref == 'refs/heads/main'
8881
run: dotnet pack -c Release identity-model-oidc-client/src/IdentityModel.OidcClient.IdentityTokenValidator --no-build -o artifacts
8982
- name: Sign packages
90-
if: github.ref == 'refs/heads/main'
9183
run: |-
9284
for file in artifacts/*.nupkg; do
9385
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

‎.github/workflows/identity-model-oidc-client-release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,19 @@ jobs:
3939
git tag -a it-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
4040
git push origin it-${{ github.event.inputs.version }}
4141
- name: Install Sectigo CodeSiging CA certificates
42-
if: github.ref == 'refs/heads/main'
4342
run: |-
4443
sudo apt-get update
4544
sudo apt-get install -y ca-certificates
46-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
45+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
4746
sudo update-ca-certificates
47+
working-directory: github/workflows
4848
- name: Pack IdentityModel.OidcClient
49-
if: github.ref == 'refs/heads/main'
5049
run: dotnet pack -c Release identity-model-oidc-client/src/IdentityModel.OidcClient --no-build -o artifacts
5150
- name: Pack IdentityModel.OidcClient.DPoP
52-
if: github.ref == 'refs/heads/main'
5351
run: dotnet pack -c Release identity-model-oidc-client/src/IdentityModel.OidcClient.DPoP --no-build -o artifacts
5452
- name: Pack IdentityModel.OidcClient.IdentityTokenValidator
55-
if: github.ref == 'refs/heads/main'
5653
run: dotnet pack -c Release identity-model-oidc-client/src/IdentityModel.OidcClient.IdentityTokenValidator --no-build -o artifacts
5754
- name: Sign packages
58-
if: github.ref == 'refs/heads/main'
5955
run: |-
6056
for file in artifacts/*.nupkg; do
6157
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

‎.github/workflows/identity-model-release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,15 @@ jobs:
3939
git tag -a it-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
4040
git push origin it-${{ github.event.inputs.version }}
4141
- name: Install Sectigo CodeSiging CA certificates
42-
if: github.ref == 'refs/heads/main'
4342
run: |-
4443
sudo apt-get update
4544
sudo apt-get install -y ca-certificates
46-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
45+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
4746
sudo update-ca-certificates
47+
working-directory: github/workflows
4848
- name: Pack IdentityModel
49-
if: github.ref == 'refs/heads/main'
5049
run: dotnet pack -c Release identity-model/src/IdentityModel --no-build -o artifacts
5150
- name: Sign packages
52-
if: github.ref == 'refs/heads/main'
5351
run: |-
5452
for file in artifacts/*.nupkg; do
5553
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

‎.github/workflows/ignore-this-ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
dotnet-version: 8.0.x
3434
- name: Test
3535
run: dotnet test -c Release test/IgnoreThis.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
36-
- id: test-report
37-
name: Test report
36+
- name: Test report - ignore-this
3837
if: success() || failure()
3938
uses: dorny/test-reporter@v1
4039
with:
@@ -44,20 +43,17 @@ jobs:
4443
fail-on-error: true
4544
fail-on-empty: true
4645
- name: Install Sectigo CodeSiging CA certificates
47-
if: github.ref == 'refs/heads/main'
4846
run: |-
4947
sudo apt-get update
5048
sudo apt-get install -y ca-certificates
51-
sudo cp build/SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
49+
sudo cp SectigoPublicCodeSigningRootCrossAAA.crt /usr/local/share/ca-certificates/
5250
sudo update-ca-certificates
51+
working-directory: github/workflows
5352
- name: Tool restore
54-
if: github.ref == 'refs/heads/main'
5553
run: dotnet tool restore
5654
- name: Pack IgnoreThis
57-
if: github.ref == 'refs/heads/main'
5855
run: dotnet pack -c Release ignore-this/src/IgnoreThis --no-build -o artifacts
5956
- name: Sign packages
60-
if: github.ref == 'refs/heads/main'
6157
run: |-
6258
for file in artifacts/*.nupkg; do
6359
dotnet NuGetKeyVaultSignTool sign \"$file\" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigning.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate CodeSigning

0 commit comments

Comments
 (0)