Skip to content

Commit 340eaa1

Browse files
committed
Attempts to fix prepublish.
1 parent c1fd3e3 commit 340eaa1

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/PostSharp.Engineering.BuildTools/Build/Publishing/PrePublishCommand.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
2525
{
2626
return false;
2727
}
28-
29-
if ( !MasterGenerator.TryWriteFiles( context, settings ) )
30-
{
31-
return false;
32-
}
33-
28+
3429
if ( product.ProductFamily.UpstreamProductFamily != null && !DownstreamMerge.CheckUpstreamChanges( context, settings ) )
3530
{
3631
return false;

src/PostSharp.Engineering.BuildTools/Utilities/GitHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static bool TryCheckoutAndPull( BuildContext context, string branch )
7272
if ( !ToolInvocationHelper.InvokeTool(
7373
context.Console,
7474
"git",
75-
$"pull origin {branch}",
75+
$"pull origin {branch} --force",
7676
context.RepoDirectory ) )
7777
{
7878
return false;

0 commit comments

Comments
 (0)