Skip to content

Commit 1237fca

Browse files
Merge pull request #92 from DuendeSoftware/ev/build-pull-request
build - don't use pull_request_target anymore
2 parents 3fb5402 + 751baf3 commit 1237fca

10 files changed

+33
-10
lines changed

.github/workflow-gen/Program.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void GenerateCiWorkflow(Component component)
4949
.Push()
5050
.Paths(paths);
5151
workflow.On
52-
.PullRequestTarget()
52+
.PullRequest()
5353
.Paths(paths);
5454

5555
workflow.EnvDefaults();
@@ -207,7 +207,7 @@ public static void StepTestAndReport(this Job job, string componentName, string
207207
job.Step()
208208
.Name($"Test report - {testProject}")
209209
.Uses("dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5") // v1.9.1
210-
.If("success() || failure()")
210+
.If("github.event == 'push' && (success() || failure())")
211211
.With(
212212
("name", $"Test Report - {testProject}"),
213213
("path", $"{componentName}/{path}/TestResults/{logFileName}"),
@@ -240,12 +240,19 @@ public static void StepSign(this Job job)
240240
"--azure-key-vault-certificate NuGetPackageSigning";
241241
job.Step()
242242
.Name("Sign packages")
243+
.IfGithubEventIsPush()
243244
.Run($"""
244245
for file in artifacts/*.nupkg; do
245246
dotnet NuGetKeyVaultSignTool sign "$file" {flags}
246247
done
247248
""");
248249
}
250+
/// <summary>
251+
/// Only run this if the build is triggered on a branch IN the same repo
252+
/// this means it's from a trusted contributor.
253+
/// </summary>
254+
public static Step IfGithubEventIsPush(this Step step)
255+
=> step.If("github.event == 'push'");
249256

250257
public static Step StepPush(this Job job, string destination, string sourceUrl, string secretName)
251258
{
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"workflow-gen": {
4+
"commandName": "Project",
5+
"workingDirectory": "$(ProjectDir)"
6+
}
7+
}
8+
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- .github/workflows/access-token-management-**
99
- access-token-management/**
1010
- Directory.Packages.props
11-
pull_request_target:
11+
pull_request:
1212
paths:
1313
- .github/workflows/access-token-management-**
1414
- access-token-management/**
@@ -45,7 +45,7 @@ jobs:
4545
- name: Test - AccessTokenManagement.Tests
4646
run: dotnet test -c Release test/AccessTokenManagement.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
4747
- name: Test report - AccessTokenManagement.Tests
48-
if: success() || failure()
48+
if: github.event == 'push' && (success() || failure())
4949
uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5
5050
with:
5151
name: Test Report - AccessTokenManagement.Tests
@@ -60,6 +60,7 @@ jobs:
6060
- name: Pack AccessTokenManagement.OpenIdConnect
6161
run: dotnet pack -c Release src/AccessTokenManagement.OpenIdConnect -o artifacts
6262
- name: Sign packages
63+
if: github.event == 'push'
6364
run: |-
6465
for file in artifacts/*.nupkg; do
6566
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- name: Tool restore
4949
run: dotnet tool restore
5050
- name: Sign packages
51+
if: github.event == 'push'
5152
run: |-
5253
for file in artifacts/*.nupkg; do
5354
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- .github/workflows/identity-model-**
99
- identity-model/**
1010
- Directory.Packages.props
11-
pull_request_target:
11+
pull_request:
1212
paths:
1313
- .github/workflows/identity-model-**
1414
- identity-model/**
@@ -45,7 +45,7 @@ jobs:
4545
- name: Test - IdentityModel.Tests
4646
run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
4747
- name: Test report - IdentityModel.Tests
48-
if: success() || failure()
48+
if: github.event == 'push' && (success() || failure())
4949
uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5
5050
with:
5151
name: Test Report - IdentityModel.Tests
@@ -58,6 +58,7 @@ jobs:
5858
- name: Pack IdentityModel
5959
run: dotnet pack -c Release src/IdentityModel -o artifacts
6060
- name: Sign packages
61+
if: github.event == 'push'
6162
run: |-
6263
for file in artifacts/*.nupkg; do
6364
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- .github/workflows/identity-model-oidc-client-**
99
- identity-model-oidc-client/**
1010
- Directory.Packages.props
11-
pull_request_target:
11+
pull_request:
1212
paths:
1313
- .github/workflows/identity-model-oidc-client-**
1414
- identity-model-oidc-client/**
@@ -45,7 +45,7 @@ jobs:
4545
- name: Test - IdentityModel.OidcClient.Tests
4646
run: dotnet test -c Release test/IdentityModel.OidcClient.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
4747
- name: Test report - IdentityModel.OidcClient.Tests
48-
if: success() || failure()
48+
if: github.event == 'push' && (success() || failure())
4949
uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5
5050
with:
5151
name: Test Report - IdentityModel.OidcClient.Tests
@@ -60,6 +60,7 @@ jobs:
6060
- name: Pack IdentityModel.OidcClient.Extensions
6161
run: dotnet pack -c Release src/IdentityModel.OidcClient.Extensions -o artifacts
6262
- name: Sign packages
63+
if: github.event == 'push'
6364
run: |-
6465
for file in artifacts/*.nupkg; do
6566
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- name: Tool restore
4949
run: dotnet tool restore
5050
- name: Sign packages
51+
if: github.event == 'push'
5152
run: |-
5253
for file in artifacts/*.nupkg; do
5354
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
- name: Tool restore
4747
run: dotnet tool restore
4848
- name: Sign packages
49+
if: github.event == 'push'
4950
run: |-
5051
for file in artifacts/*.nupkg; do
5152
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- .github/workflows/ignore-this-**
99
- ignore-this/**
1010
- Directory.Packages.props
11-
pull_request_target:
11+
pull_request:
1212
paths:
1313
- .github/workflows/ignore-this-**
1414
- ignore-this/**
@@ -45,7 +45,7 @@ jobs:
4545
- name: Test - IgnoreThis.Tests
4646
run: dotnet test -c Release test/IgnoreThis.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
4747
- name: Test report - IgnoreThis.Tests
48-
if: success() || failure()
48+
if: github.event == 'push' && (success() || failure())
4949
uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5
5050
with:
5151
name: Test Report - IgnoreThis.Tests
@@ -58,6 +58,7 @@ jobs:
5858
- name: Pack IgnoreThis
5959
run: dotnet pack -c Release src/IgnoreThis -o artifacts
6060
- name: Sign packages
61+
if: github.event == 'push'
6162
run: |-
6263
for file in artifacts/*.nupkg; do
6364
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

.github/workflows/ignore-this-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
- name: Tool restore
4747
run: dotnet tool restore
4848
- name: Sign packages
49+
if: github.event == 'push'
4950
run: |-
5051
for file in artifacts/*.nupkg; do
5152
dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.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 NuGetPackageSigning

0 commit comments

Comments
 (0)