File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -208,9 +208,13 @@ private static TeamCityBuildConfiguration CreateUpstreamMergeConfiguration( Prod
208208 // Use Claude Dockerfile for upstream merge to enable AI-assisted conflict resolution
209209 var claudeDockerSpec = product . DockerSpec ? . WithClaudeDockerfile ( ) ;
210210
211- // Dependencies on UpstreamMerge of dependent repos (for cascading merge order)
212- // No DebugBuild dependencies - Claude only does git merge and conflict resolution,
213- // it doesn't compile. The PR build will handle compilation with appropriate artifacts.
211+ // Dependencies on UpstreamMerge of dependent repos (for cascading merge order).
212+ //
213+ // We intentionally have NO DebugBuild artifact dependencies here. The UpstreamMerge runs
214+ // BEFORE dependencies have been merged and deployed. If this repo depends on changes from
215+ // an upstream repo that haven't been published yet, the build would fail even with correctly
216+ // resolved conflicts. Claude only does git merge and conflict resolution - the PR build
217+ // runs AFTER the merge PR is created, when the dependency chain is complete.
214218 var snapshotDependencies =
215219 product . ParametrizedDependencies
216220 . Where ( d => d . Definition . GenerateSnapshotDependency && d . Definition . ProductFamily . UpstreamProductFamily != null )
You can’t perform that action at this time.
0 commit comments