Skip to content

Commit dd9e67a

Browse files
authored
Fix running IT on OSX (#1069)
1 parent 1c17e98 commit dd9e67a

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

source/Octopus.Tentacle.Tests.Integration/Support/TentacleFetchers/LinuxTentacleFetcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void ExtractTarGzip(string gzArchiveName, string destFolder, ILogg
6464
Action<string> log = s => logger.Information(s);
6565
var exitCode = SilentProcessRunner.ExecuteCommand(
6666
"tar",
67-
$"xzvf {gzArchiveName} -C {destFolder}",
67+
$"xzvf \"{gzArchiveName}\" -C \"{destFolder}\"",
6868
tmp.DirectoryPath,
6969
log,
7070
log,

source/Octopus.Tentacle.Tests.Integration/Support/TentacleFetchers/NugetTentacleFetcher.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ async Task<string> DownloadAndExtractFromUrl(string directoryPath, Version versi
7373

7474
public string[] TentacleArtifactNames(Version version, TentacleRuntime runtime)
7575
{
76+
// Tentacle 8.2 is/was built on .NET8, previous versions were built on .NET6
77+
string runtimeForVersion = version.Major >= 8 && version.Minor >= 2
78+
? RuntimeDetection.DotNet8
79+
: RuntimeDetection.DotNet6;
7680
if (PlatformDetection.IsRunningOnWindows)
7781
{
78-
// Tentacle 8.2 is/was built on .NET8, previous versions were built on .NET6
79-
string runtimeForVersion = version.Major >= 8 && version.Minor >= 2
80-
? RuntimeDetection.DotNet8
81-
: RuntimeDetection.DotNet6;
82-
8382
var net48ArtifactNames = new[] {"tentacle-net48-win.zip"};
8483
var dotnetArtifactNames = Architectures()
8584
.Select(a => $"tentacle-{runtimeForVersion}-win-{a}.zip")
@@ -98,14 +97,14 @@ public string[] TentacleArtifactNames(Version version, TentacleRuntime runtime)
9897
if (PlatformDetection.IsRunningOnMac)
9998
{
10099
return Architectures()
101-
.Select(a => $"tentacle-{RuntimeDetection.GetCurrentRuntime()}-osx-{a}.tar.gz")
100+
.Select(a => $"tentacle-{runtimeForVersion}-osx-{a}.tar.gz")
102101
.ToArray();
103102
}
104103

105104
if (PlatformDetection.IsRunningOnNix)
106105
{
107106
return Architectures()
108-
.Select(a => $"tentacle-{RuntimeDetection.GetCurrentRuntime()}-linux-{a}.tar.gz")
107+
.Select(a => $"tentacle-{runtimeForVersion}-linux-{a}.tar.gz")
109108
.ToArray();
110109
}
111110

0 commit comments

Comments
 (0)