diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs index 2b8176bed9..e9dfc26540 100644 --- a/build/artifacts/Tasks/ArtifactsNativeTest.cs +++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs @@ -29,11 +29,13 @@ public override void Run(BuildContext context) { if (context.SkipImageForArtifacts(dockerImage)) continue; - var runtime = dockerImage.Architecture == Architecture.Amd64 ? "linux-x64" : "linux-arm64"; + var runtime = "linux"; if (dockerImage.Distro.StartsWith("alpine")) { - runtime = "linux-musl-x64"; + runtime += "-musl"; } + runtime += dockerImage.Architecture == Architecture.Amd64 ? "-x64" : "-arm64"; + var cmd = $"{rootPrefix}/scripts/test-native-tool.sh --version {version} --repoPath {rootPrefix}/repo --runtime {runtime}"; diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs index cdb45a806a..5ea66c239e 100644 --- a/build/common/Utilities/Constants.cs +++ b/build/common/Utilities/Constants.cs @@ -18,7 +18,7 @@ public class Constants public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 }; public static readonly string[] VersionsToBuild = { Version60, Version70 }; - public static readonly string[] DistrosToSkipForArtifacts = { Alpine316, Alpine317, Centos7, Ubuntu2204 }; + public static readonly string[] DistrosToSkipForArtifacts = { Centos7 }; public static readonly string[] DistrosToSkipForDocker = { Centos7 }; public const string DockerBaseImageName = "gittools/build-images";