Skip to content

Align CI detection with documented provider variables #233

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

Draft
Copilot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Align CI detection with documented provider variables #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions IntelliTect.Multitool.Tests/CIDetectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class CIDetectionTests
[InlineData("CIRCLECI", "true")]
[InlineData("CONTINUOUS_INTEGRATION", "true")]
[InlineData("TF_BUILD", "true")]
[InlineData("JB_SPACE_API_URL", "https://space.example")]
[InlineData("TEAMCITY_VERSION", "1.0")]
[InlineData("APPVEYOR", "True")]
[InlineData("BuildRunner", "MyGet")]
Expand All @@ -48,6 +49,31 @@ public void CiEnvVar_SetsCIPropertyToTrue(string envVar, string value)
Assert.Equal("true", ci);
}

[Theory]
[InlineData("BUILD_ID", "build", "BUILD_URL", "https://jenkins.example/build")]
[InlineData("BUILD_ID", "build", "PROJECT_ID", "project")]
[InlineData("CODEBUILD_BUILD_ID", "build", "AWS_REGION", "us-east-1")]
public void CiEnvVarPair_SetsCIPropertyToTrue(string firstEnvVar, string firstValue, string secondEnvVar, string secondValue)
{
string ci = EvaluateCIProperty(new Dictionary<string, string>
{
[firstEnvVar] = firstValue,
[secondEnvVar] = secondValue
});
Assert.Equal("true", ci);
}

[Theory]
[InlineData("BUILD_ID", "build")]
[InlineData("BUILD_URL", "https://jenkins.example/build")]
[InlineData("CODEBUILD_BUILD_ID", "build")]
[InlineData("AWS_REGION", "us-east-1")]
public void IncompleteCiEnvVarPair_DoesNotSetCIPropertyToTrue(string envVar, string value)
{
string ci = EvaluateCIProperty(new Dictionary<string, string> { [envVar] = value });
Assert.Equal("false", ci);
}

[Fact]
public void NoCiEnvVars_SetsCIPropertyToFalse()
{
Expand Down
4 changes: 4 additions & 0 deletions IntelliTect.Multitool/Build/IntelliTect.Multitool.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
'$(CIRCLECI)' == 'true' or
'$(CONTINUOUS_INTEGRATION)' == 'true' or
'$(TF_BUILD)' == 'true' or
('$(BUILD_ID)' != '' and '$(BUILD_URL)' != '') or
('$(BUILD_ID)' != '' and '$(PROJECT_ID)' != '') or
('$(CODEBUILD_BUILD_ID)' != '' and '$(AWS_REGION)' != '') or
'$(TEAMCITY_VERSION)' != '' or
'$(APPVEYOR)' != '' or
'$(BuildRunner)' == 'MyGet' or
'$(JB_SPACE_API_URL)' != '' or
'$(JENKINS_URL)' != '' or
'$(TRAVIS)' == 'true' or
'$(BUDDY)' == 'true' or
Expand Down