Skip to content

Commit d987c16

Browse files
committed
Adjust sign build step
1 parent f09e117 commit d987c16

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,32 @@ jobs:
4444
- name: Build
4545
env:
4646
SignClientSecret: ${{ secrets.SignClientSecret }}
47-
run: ./build.ps1 sign
48-
49-
- name: Push packages to MyGet
50-
run: dotnet nuget push artifacts\*.nupkg -s https://www.myget.org/F/duende_identityserver/api/v2/package -k ${{ secrets.MYGET }}
47+
run: ./build.ps1
5148

5249
- name: Test report
5350
id: test-report
5451
uses: dorny/test-reporter@v1
5552
if: success() || failure() # run this step even if previous step failed
5653
with:
5754
name: test results
58-
path: access-token-management/test/Tests/TestResults/Test.trx
55+
path: access-token-management/test/AccessTokenManagement.Tests/TestResults/Test.trx
5956
reporter: dotnet-trx
6057
fail-on-error: true
6158
fail-on-empty: true
6259

60+
- name: Sign
61+
if: (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
62+
env:
63+
SignClientSecret: ${{ secrets.SignClientSecret }}
64+
run: ./build.ps1 sign
65+
66+
- name: Push packages to MyGet
67+
if: (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
68+
run: dotnet nuget push artifacts\*.nupkg -s https://www.myget.org/F/duende_identityserver/api/v2/package -k ${{ secrets.MYGET }}
69+
6370
- name: Upload artifacts
6471
uses: actions/upload-artifact@v4
65-
if: success() || failure() # run this step even if previous step failed
72+
if: (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
6673
with:
6774
path: access-token-management/artifacts/*.nupkg
6875
compression-level: 0

access-token-management/build/Program.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ private static class Targets
2020
public const string Build = "build";
2121
public const string Test = "test";
2222
public const string Pack = "pack";
23-
public const string SignBinary = "sign-binary";
24-
public const string SignPackage = "sign-package";
23+
public const string Sign = "sign";
2524
}
2625

2726
internal static async Task Main(string[] args)
@@ -64,15 +63,10 @@ internal static async Task Main(string[] args)
6463
Run("dotnet", $"pack src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
6564
});
6665

67-
Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>
68-
{
69-
SignNuGet();
70-
});
66+
Target(Targets.Sign, DependsOn(Targets.RestoreTools), SignNuGet);
7167

7268
Target("default", DependsOn(Targets.Test, Targets.Pack));
7369

74-
Target("sign", DependsOn(Targets.Test, Targets.SignPackage));
75-
7670
await RunTargetsAndExitAsync(args, ex => ex is SimpleExec.ExitCodeException || ex.Message.EndsWith(envVarMissing));
7771
}
7872

0 commit comments

Comments
 (0)