Skip to content

Enhance logic of getting current branch in case of drone #1686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arturcic merged 2 commits into from
May 21, 2019
Merged

Enhance logic of getting current branch in case of drone #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf6d32
enhance GetCurrentBranch for drone
May 21, 2019
e781749
implement unit tests
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 101 additions & 0 deletions src/GitVersionCore.Tests/BuildServers/DroneTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,106 @@ public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotS
// Assert
result.ShouldBeFalse();
}

[Test]
public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
{
// Arrange
const string droneBranch = "droneBranch";

Environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "");
Environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);

var buildServer = new Drone();

// Act
var result = buildServer.GetCurrentBranch(false);

// Assert
result.ShouldBe(droneBranch);
}

[Test]
public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNonEmptyDroneSourceBranch()
{
// Arrange
const string droneSourceBranch = "droneSourceBranch";
Environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
Environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", droneSourceBranch);

var buildServer = new Drone();

// Act
var result = buildServer.GetCurrentBranch(false);

// Assert
result.ShouldBe(droneSourceBranch);
}

[Test]
public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPullRequestAndEmptyDroneSourceBranch()
{
// Arrange
const string droneSourceBranch = "droneSourceBranch";
const string droneDestinationBranch = "droneDestinationBranch";

string ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";

Environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
Environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
Environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);

var buildServer = new Drone();

// Act
var result = buildServer.GetCurrentBranch(false);

// Assert
result.ShouldBe(droneSourceBranch);
}

[Test]
public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
{
// Arrange
const string droneBranch = "droneBranch";

Environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
Environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
Environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", "");
Environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);

var buildServer = new Drone();

// Act
var result = buildServer.GetCurrentBranch(false);

// Assert
result.ShouldBe(droneBranch);
}

[Test]
public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
{
// Arrange
const string droneBranch = "droneBranch";
const string droneSourceBranch = "droneSourceBranch";
const string droneDestinationBranch = "droneDestinationBranch";

string ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";

Environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
Environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
Environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
Environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);

var buildServer = new Drone();

// Act
var result = buildServer.GetCurrentBranch(false);

// Assert
result.ShouldBe(droneBranch);
}
}
}
25 changes: 25 additions & 0 deletions src/GitVersionCore/BuildServers/Drone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,31 @@ public override string[] GenerateSetParameterMessage(string name, string value)

public override string GetCurrentBranch(bool usingDynamicRepos)
{
// In Drone DRONE_BRANCH variable is equal to destination branch in case of pull request
// https://discourse.drone.io/t/getting-the-branch-a-pull-request-is-created-from/670
// Unfortunately, DRONE_REFSPEC isn't populated, however CI_COMMIT_REFSPEC can be used instead of.
var pullRequestNumber = Environment.GetEnvironmentVariable("DRONE_PULL_REQUEST");
if (!string.IsNullOrWhiteSpace(pullRequestNumber))
{
// DRONE_SOURCE_BRANCH is available in Drone 1.x.x version
var sourceBranch = Environment.GetEnvironmentVariable("DRONE_SOURCE_BRANCH");
if (!string.IsNullOrWhiteSpace(sourceBranch))
return sourceBranch;

// In drone lower than 1.x.x source branch can be parsed from CI_COMMIT_REFSPEC
// CI_COMMIT_REFSPEC - {sourceBranch}:{destinationBranch}
// https://github.com/drone/drone/issues/2222
var ciCommitRefSpec = Environment.GetEnvironmentVariable("CI_COMMIT_REFSPEC");
if (!string.IsNullOrWhiteSpace(ciCommitRefSpec))
{
var colonIndex = ciCommitRefSpec.IndexOf(':');
if (colonIndex > 0)
{
return ciCommitRefSpec.Substring(0, colonIndex);
}
}
}

return Environment.GetEnvironmentVariable("DRONE_BRANCH");
}
}
Expand Down