|
11 | 11 | InvokeTargets = new[] { nameof(Default) }, |
12 | 12 | NonEntryTargets = new[] { |
13 | 13 | nameof(ICIEnvironment.CIEnvironment), |
14 | | - nameof(ITriggerCodeCoverageReports.Trigger_Code_Coverage_Reports), |
15 | | - nameof(ITriggerCodeCoverageReports.Generate_Code_Coverage_Report_Cobertura), |
16 | | - nameof(IGenerateCodeCoverageBadges.Generate_Code_Coverage_Badges), |
17 | | - nameof(IGenerateCodeCoverageReport.Generate_Code_Coverage_Report), |
18 | | - nameof(IGenerateCodeCoverageSummary.Generate_Code_Coverage_Summary), |
| 14 | + nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports), |
| 15 | + nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura), |
| 16 | + nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges), |
| 17 | + nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport), |
| 18 | + nameof(IGenerateCodeCoverageSummary.GenerateCodeCoverageSummary), |
19 | 19 | nameof(Default) |
20 | 20 | }, |
21 | 21 | ExcludedTargets = new[] |
|
26 | 26 | } |
27 | 27 | )] |
28 | 28 | [GitHubActionsSteps( |
29 | | - "ci", GitHubActionsImage.MacOsLatest, GitHubActionsImage.WindowsLatest, GitHubActionsImage.UbuntuLatest, |
| 29 | + "ci", |
| 30 | + GitHubActionsImage.MacOsLatest, |
| 31 | + GitHubActionsImage.WindowsLatest, |
| 32 | + GitHubActionsImage.UbuntuLatest, |
30 | 33 | AutoGenerate = false, |
31 | 34 | On = new[] { GitHubActionsTrigger.Push }, |
32 | 35 | OnPushTags = new[] { "v*" }, |
33 | | - OnPushBranches = new[] { "master", "next" }, |
34 | | - OnPullRequestBranches = new[] { "master", "next" }, |
| 36 | + OnPushBranches = new[] { "master", "main", "next" }, |
| 37 | + OnPullRequestBranches = new[] { "master", "main", "next" }, |
35 | 38 | InvokedTargets = new[] { nameof(Default) }, |
36 | | - NonEntryTargets = new[] { |
| 39 | + NonEntryTargets = new[] |
| 40 | + { |
37 | 41 | nameof(ICIEnvironment.CIEnvironment), |
38 | | - nameof(ITriggerCodeCoverageReports.Trigger_Code_Coverage_Reports), |
39 | | - nameof(ITriggerCodeCoverageReports.Generate_Code_Coverage_Report_Cobertura), |
40 | | - nameof(IGenerateCodeCoverageBadges.Generate_Code_Coverage_Badges), |
41 | | - nameof(IGenerateCodeCoverageReport.Generate_Code_Coverage_Report), |
42 | | - nameof(IGenerateCodeCoverageSummary.Generate_Code_Coverage_Summary), |
| 42 | + nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports), |
| 43 | + nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura), |
| 44 | + nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges), |
| 45 | + nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport), |
| 46 | + nameof(IGenerateCodeCoverageSummary.GenerateCodeCoverageSummary), |
43 | 47 | nameof(Default) |
44 | 48 | }, |
45 | 49 | ExcludedTargets = new[] { nameof(ICanClean.Clean), nameof(ICanRestoreWithDotNetCore.DotnetToolRestore) }, |
|
48 | 52 | [PrintBuildVersion] |
49 | 53 | [PrintCIEnvironment] |
50 | 54 | [UploadLogs] |
| 55 | +[TitleEvents] |
51 | 56 | public partial class Solution |
52 | 57 | { |
53 | 58 | public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGitHubActionsConfiguration configuration) |
54 | 59 | { |
55 | | - var buildJob = configuration.Jobs.First(z => z.Name == "Build"); |
| 60 | + var buildJob = configuration.Jobs.OfType<RocketSurgeonsGithubActionsJob>().First(z => z.Name == "Build"); |
| 61 | + buildJob.FailFast = false; |
56 | 62 | var checkoutStep = buildJob.Steps.OfType<CheckoutStep>().Single(); |
57 | 63 | // For fetch all |
58 | 64 | checkoutStep.FetchDepth = 0; |
| 65 | + buildJob.Environment["NUGET_PACKAGES"] = "${{ github.workspace }}/.nuget/packages"; |
59 | 66 | buildJob.Steps.InsertRange( |
60 | 67 | buildJob.Steps.IndexOf(checkoutStep) + 1, new BaseGitHubActionsStep[] { |
61 | 68 | new RunStep("Fetch all history for all tags and branches") { |
62 | 69 | Run = "git fetch --prune" |
63 | 70 | }, |
64 | | - new SetupDotNetStep("Use .NET Core 2.1 SDK") { |
65 | | - DotNetVersion = "2.1.x" |
| 71 | + new UsingStep("NuGet Cache") |
| 72 | + { |
| 73 | + Uses = "actions/cache@v2", |
| 74 | + With = |
| 75 | + { |
| 76 | + ["path"] = "${{ github.workspace }}/.nuget/packages", |
| 77 | + // keep in mind using central package versioning here |
| 78 | + ["key"] = |
| 79 | + "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Build.targets', '**/Directory.Build.props', '**/*.csproj') }}", |
| 80 | + ["restore-keys"] = @"| |
| 81 | + ${{ runner.os }}-nuget-" |
| 82 | + } |
66 | 83 | }, |
67 | 84 | new SetupDotNetStep("Use .NET Core 3.1 SDK") { |
68 | 85 | DotNetVersion = "3.1.x" |
69 | 86 | }, |
70 | | - new SetupDotNetStep("Use .NET Core 5.0 SDK") { |
71 | | - DotNetVersion = "5.0.x" |
| 87 | + new SetupDotNetStep("Use .NET Core 6.0 SDK") { |
| 88 | + DotNetVersion = "6.0.x" |
72 | 89 | }, |
73 | 90 | } |
74 | 91 | ); |
@@ -115,24 +132,6 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi |
115 | 132 | } |
116 | 133 | ); |
117 | 134 |
|
118 | | - |
119 | | - /* |
120 | | -
|
121 | | - - publish: "${{ parameters.Artifacts }}/logs/" |
122 | | - displayName: Publish Logs |
123 | | - artifact: "Logs${{ parameters.Postfix }}" |
124 | | - condition: always() |
125 | | -
|
126 | | - - publish: ${{ parameters.Coverage }} |
127 | | - displayName: Publish Coverage |
128 | | - artifact: "Coverage${{ parameters.Postfix }}" |
129 | | - condition: always() |
130 | | -
|
131 | | - - publish: "${{ parameters.Artifacts }}/nuget/" |
132 | | - displayName: Publish NuGet Artifacts |
133 | | - artifact: "NuGet${{ parameters.Postfix }}" |
134 | | - condition: always() |
135 | | - */ |
136 | 135 | return configuration; |
137 | 136 | } |
138 | 137 | } |
0 commit comments