Skip to content

Commit 7adced6

Browse files
only handle tags, ignore pull request behavior
1 parent deb51dd commit 7adced6

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,13 @@ public void GetCurrentBranchShouldHandleTags()
9090
public void GetCurrentBranchShouldHandlePullRequests()
9191
{
9292
// Arrange
93-
this.environment.SetEnvironmentVariable("GITHUB_EVENT_NAME", "pull_request");
94-
this.environment.SetEnvironmentVariable("GITHUB_HEAD_REF", "some-branch");
95-
this.environment.SetEnvironmentVariable("GITHUB_BASE_REF", MainBranch);
9693
this.environment.SetEnvironmentVariable("GITHUB_REF", "refs/pull/1/merge");
9794

9895
// Act
9996
var result = this.buildServer.GetCurrentBranch(false);
10097

10198
// Assert
102-
result.ShouldBe("some-branch");
99+
result.ShouldBe("refs/pull/1/merge");
103100
}
104101

105102
[Test]

src/GitVersion.BuildAgents/Agents/GitHubActions.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,12 @@ public override void WriteIntegration(Action<string?> writer, GitVersionVariable
5353

5454
public override string? GetCurrentBranch(bool usingDynamicRepos)
5555
{
56-
var refType = Environment.GetEnvironmentVariable("GITHUB_REF_TYPE") ?? "";
57-
var eventName = Environment.GetEnvironmentVariable("GITHUB_EVENT_NAME") ?? "";
5856
// https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
5957
// GITHUB_REF must be used only for "real" branches, not for tags.
6058
// Bug fix for https://github.com/GitTools/GitVersion/issues/2838
6159

62-
// pull_request or pull_request_target
63-
if (eventName.StartsWith("pull_request", StringComparison.OrdinalIgnoreCase))
64-
{
65-
return Environment.GetEnvironmentVariable("GITHUB_HEAD_REF");
66-
}
67-
68-
if (refType.Equals("tag", StringComparison.OrdinalIgnoreCase))
69-
{
70-
return null;
71-
}
72-
73-
return Environment.GetEnvironmentVariable("GITHUB_REF");
60+
var refType = Environment.GetEnvironmentVariable("GITHUB_REF_TYPE") ?? "";
61+
return refType.Equals("tag", StringComparison.OrdinalIgnoreCase) ? null : Environment.GetEnvironmentVariable("GITHUB_REF");
7462
}
7563

7664
public override bool PreventFetch() => true;

0 commit comments

Comments
 (0)