Skip to content

Commit 0d5c064

Browse files
committed
(build) fix docker artifacts test
1 parent 6b3ff65 commit 0d5c064

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

build/artifacts/Tasks/ArtifactsNativeTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ public override void Run(BuildContext context)
2929
{
3030
if (context.SkipImageForArtifacts(dockerImage)) continue;
3131

32-
var runtime = dockerImage.Architecture == Architecture.Amd64 ? "linux-x64" : "linux-arm64";
32+
var runtime = "linux";
3333
if (dockerImage.Distro.StartsWith("alpine"))
3434
{
35-
runtime = "linux-musl-x64";
35+
runtime += "-musl";
3636
}
37+
runtime += dockerImage.Architecture == Architecture.Amd64 ? "-x64" : "-arm64";
38+
3739

3840
var cmd = $"{rootPrefix}/scripts/test-native-tool.sh --version {version} --repoPath {rootPrefix}/repo --runtime {runtime}";
3941

build/common/Utilities/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Constants
1818

1919
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
2020
public static readonly string[] VersionsToBuild = { Version60, Version70 };
21-
public static readonly string[] DistrosToSkipForArtifacts = { Alpine316, Alpine317, Centos7, Ubuntu2204 };
21+
public static readonly string[] DistrosToSkipForArtifacts = { Centos7 };
2222
public static readonly string[] DistrosToSkipForDocker = { Centos7 };
2323

2424
public const string DockerBaseImageName = "gittools/build-images";

0 commit comments

Comments
 (0)