Skip to content

Commit 6de563f

Browse files
committed
(build) test artifacts, set default install path for global tool
1 parent 264b864 commit 6de563f

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build/artifacts-test.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Task("Artifacts-DotnetTool-Test")
2323

2424
foreach(var dockerImage in parameters.Docker.Images)
2525
{
26-
var cmd = $"-file {rootPrefix}/scripts/Test-DotnetGlobalTool.ps1 -version {version} -repoPath {rootPrefix}/repo -nugetPath {rootPrefix}/nuget -toolPath {rootPrefix}/gitversion";
26+
var cmd = $"-file {rootPrefix}/scripts/Test-DotnetGlobalTool.ps1 -version {version} -repoPath {rootPrefix}/repo -nugetPath {rootPrefix}/nuget";
2727

2828
DockerTestArtifact(dockerImage, parameters, cmd);
2929
}
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
param(
22
[parameter(Mandatory=$true, Position=0)][string] $version,
33
[parameter(Mandatory=$true, Position=1)][string] $nugetPath,
4-
[parameter(Mandatory=$true, Position=2)][string] $repoPath,
5-
[parameter(Mandatory=$true, Position=3)][string] $toolPath
4+
[parameter(Mandatory=$true, Position=2)][string] $repoPath
65
)
76

8-
$result = dotnet tool install GitVersion.Tool --version $version --tool-path $toolPath --add-source $nugetPath | out-null;
7+
$result = dotnet tool install GitVersion.Tool --version $version --tool-path $rootPrefix/tools --add-source $nugetPath | out-null;
98

109
if($LASTEXITCODE -eq 0) {
11-
& "$rootPrefix/gitversion/dotnet-gitversion" $repoPath /showvariable FullSemver;
10+
& "$rootPrefix/tools/dotnet-gitversion" $repoPath /showvariable FullSemver;
1211
} else {
1312
Write-Output $result
1413
}

0 commit comments

Comments
 (0)