Skip to content

Commit f63f1dd

Browse files
committed
Downstream merge: ignore failures of snapshot dependencies.
1 parent 80fd21d commit f63f1dd

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private static TeamCityBuildConfiguration CreateDownstreamMergeConfiguration( Pr
212212
product.ParametrizedDependencies
213213
.Where( d => d.Definition.GenerateSnapshotDependency )
214214
.Select( d => d.Definition )
215-
.Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.DownstreamMergeBuildType, true, FailureAction: FailureAction.AddProblem ) ) );
215+
.Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.DownstreamMergeBuildType, true, FailureAction: FailureAction.Ignore ) ) );
216216

217217
var downstreamMergeConfiguration = new TeamCityBuildConfiguration(
218218
"DownstreamMerge",

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCityBuildConfiguration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ void AddBuildStep( BuildStep newStep )
290290
{
291291
FailureAction.FailToStart => "FAIL_TO_START",
292292
FailureAction.AddProblem => "ADD_PROBLEM",
293+
FailureAction.Ignore => "IGNORE",
294+
FailureAction.Cancel => "CANCEL",
293295
_ => throw new ArgumentOutOfRangeException()
294296
};
295297

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCitySnapshotDependency.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ internal record TeamCitySnapshotDependency( string ObjectId, bool IsAbsoluteId,
77
internal enum FailureAction
88
{
99
FailToStart,
10-
AddProblem
10+
AddProblem,
11+
Ignore,
12+
Cancel
1113
}

0 commit comments

Comments
 (0)