diff --git a/buildpipeline/alpine.3.6.groovy b/buildpipeline/linux-musl.groovy similarity index 88% rename from buildpipeline/alpine.3.6.groovy rename to buildpipeline/linux-musl.groovy index 08ed7cb4af4f..7f5b41103f9a 100644 --- a/buildpipeline/alpine.3.6.groovy +++ b/buildpipeline/linux-musl.groovy @@ -17,13 +17,13 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-2017111 } stage ('Generate version assets') { // Generate the version assets. Do we need to even do this for non-official builds? - sh "./build-managed.sh -runtimeos=alpine.3.6 -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:PortableBuild=false" + sh "./build-managed.sh -runtimeos=linux-musl -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:PortableBuild=false" } stage ('Sync') { - sh "./sync.sh -p -runtimeos=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false" + sh "./sync.sh -p -runtimeos=linux-musl -- /p:ArchGroup=x64 /p:PortableBuild=false" } stage ('Build Product') { - sh "./build.sh -buildArch=x64 -runtimeos=alpine.3.6 -${params.CGroup} -- /p:PortableBuild=false" + sh "./build.sh -buildArch=x64 -runtimeos=linux-musl -${params.CGroup} -- /p:PortableBuild=false" } stage ('Build Tests') { def additionalArgs = '' diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index f415f7d086e1..edbda97fd9e9 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -48,22 +48,6 @@ "Type": "build/product/" } }, - { - "Name": "DotNet-CoreFx-Trusted-Linux", - "Parameters": { - "PB_DockerTag": "alpine-3.6-3148f11-20171119021156", - "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=alpine.3.6 -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", - "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=alpine.3.6 -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false", - "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Alpine.36.Amd64", - "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" - }, - "ReportingParameters": { - "OperatingSystem": "Alpine3.6", - "Platform": "x64", - "Type": "build/product/" - } - }, { "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { diff --git a/buildpipeline/pipelinejobs.groovy b/buildpipeline/pipelinejobs.groovy index b5b174a2c8f9..9173030414fd 100644 --- a/buildpipeline/pipelinejobs.groovy +++ b/buildpipeline/pipelinejobs.groovy @@ -17,7 +17,7 @@ def branch = GithubBranchName def linPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux.groovy') def linArm64Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux.arm64.groovy') def centos6Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/centos.6.groovy') -def alpine36Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/alpine.3.6.groovy') +def linmuslPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux-musl.groovy') def osxPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/osx.groovy') def winPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/windows.groovy') @@ -25,7 +25,7 @@ def configurations = [ ['TGroup':"netcoreapp", 'Pipeline':linPipeline, 'Name':'Linux' ,'ForPR':"Release-x64", 'Arch':['x64']], ['TGroup':"netcoreapp", 'Pipeline':linArm64Pipeline, 'Name':'Linux' ,'ForPR':"Release-arm64", 'Arch':['arm64']], ['TGroup':"netcoreapp", 'Pipeline':centos6Pipeline, 'Name':'CentOS.6' ,'ForPR':"", 'Arch':['x64']], - ['TGroup':"netcoreapp", 'Pipeline':alpine36Pipeline, 'Name':'Alpine.3.6' ,'ForPR':"Debug-x64", 'Arch':['x64']], + ['TGroup':"netcoreapp", 'Pipeline':linmuslPipeline, 'Name':'Linux-musl' ,'ForPR':"Debug-x64", 'Arch':['x64']], ['TGroup':"netcoreapp", 'Pipeline':osxPipeline, 'Name':'OSX', 'ForPR':"Debug-x64", 'Arch':['x64']], ['TGroup':"netcoreapp", 'Pipeline':winPipeline, 'Name':'Windows' , 'ForPR':"Debug-x64|Release-x86"], ['TGroup':"netfx", 'Pipeline':winPipeline, 'Name':'NETFX', 'ForPR':"Release-x86"], diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 24003d9ab2ed..120512d43572 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -3,8 +3,6 @@ $(PackageRID) - - alpine.3.6-x64 true $(NoWarn);NU1603;NU1605 diff --git a/init-tools.sh b/init-tools.sh index 0f5caaafe225..4d656defe282 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -94,9 +94,7 @@ if [ ! -e "$__DOTNET_PATH" ]; then if [ -e /etc/os-release ]; then source /etc/os-release if [[ $ID == "alpine" ]]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} - __PKG_RID=alpine.$VERSION_ID + __PKG_RID=linux-musl fi elif [ -e /etc/redhat-release ]; then redhatRelease=$( - arm