Skip to content

Commit c6f56ba

Browse files
committed
Git authentication: added verification.
1 parent 07c9877 commit c6f56ba

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

src/PostSharp.Engineering.BuildTools/Build/Bumping/BumpCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static bool Execute( BuildContext context, BumpSettings settings )
3333
return false;
3434
}
3535

36-
if ( !GitHelper.ConfigureAuthentication( context ) )
36+
if ( !GitHelper.ConfigureCredentials( context ) )
3737
{
3838
console.WriteError( "Cannot configure git credentials." );
3939

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
9595
return false;
9696
}
9797

98-
if ( !GitHelper.ConfigureAuthentication( context ) )
98+
if ( !GitHelper.ConfigureCredentials( context ) )
9999
{
100100
context.Console.WriteError( "Cannot configure git credentials." );
101101

src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ if (-not $KeepEnv)
9999
}
100100

101101
$env:GIT_USER_EMAIL = git config --global user.email
102-
103102
$env:GIT_USER_NAME = git config --global user.name
104103

105104
if ( $env:IS_TEAMCITY_AGENT )

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,17 +623,26 @@ public static bool TryGetLatestCommitDate( BuildContext context, [NotNullWhen( t
623623
return true;
624624
}
625625

626-
public static bool ConfigureAuthentication( BuildContext context )
626+
public static bool ConfigureCredentials( BuildContext context )
627627
{
628628
var console = context.Console;
629-
var environmentVariable = context.Product.DependencyDefinition.VcsRepository.TokenEnvironmentVariableName;
629+
var environmentVariableName = context.Product.DependencyDefinition.VcsRepository.TokenEnvironmentVariableName;
630630

631631
console.WriteMessage( "Configuring git credentials." );
632632

633633
if ( RuntimeInformation.IsOSPlatform( OSPlatform.Windows ) )
634634
{
635+
var environmentVariableValue = Environment.GetEnvironmentVariable( environmentVariableName );
636+
637+
if ( string.IsNullOrEmpty( environmentVariableValue ) )
638+
{
639+
console.WriteError( $"The environment variable {environmentVariableName} is not defined." );
640+
641+
return false;
642+
}
643+
635644
var tempFileName = Path.Combine( Path.GetTempPath(), "git-askpass.cmd" );
636-
File.WriteAllText( tempFileName, $"@echo off\r\necho %{environmentVariable}%" );
645+
File.WriteAllText( tempFileName, $"@echo off\r\necho %{environmentVariableName}%" );
637646

638647
if ( !ToolInvocationHelper.InvokeTool( console, "git", "config --global credential.helper \"\"" ) )
639648
{

0 commit comments

Comments
 (0)