diff options
-rwxr-xr-x | build-packages.sh | 5 | ||||
-rwxr-xr-x | build-test.sh | 8 | ||||
-rwxr-xr-x | build.sh | 5 | ||||
-rw-r--r-- | buildpipeline/linux-musl.groovy (renamed from buildpipeline/alpine.3.6.groovy) | 0 | ||||
-rw-r--r-- | buildpipeline/pipelinejobs.groovy | 4 | ||||
-rw-r--r-- | buildpipeline/pipelines.json | 14 | ||||
-rwxr-xr-x | init-tools.sh | 4 | ||||
-rw-r--r-- | src/.nuget/dir.props | 1 |
8 files changed, 14 insertions, 27 deletions
diff --git a/build-packages.sh b/build-packages.sh index 838f5bd7f3..f06024e7f6 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -16,11 +16,14 @@ initHostDistroRid() if [ "$__HostOS" == "Linux" ]; then if [ -e /etc/os-release ]; then source /etc/os-release - if [[ $ID == "alpine" || $ID == "rhel" ]]; then + if [[ $ID == "rhel" ]]; then # remove the last version digit VERSION_ID=${VERSION_ID%.*} fi __HostDistroRid="$ID.$VERSION_ID-$__Arch" + if [[ $ID == "alpine" ]]; then + __HostDistroRid="linux-musl-$__Arch" + fi elif [ -e /etc/redhat-release ]; then local redhatRelease=$(</etc/redhat-release) if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then diff --git a/build-test.sh b/build-test.sh index 7cb4c02fac..2de1f69e28 100755 --- a/build-test.sh +++ b/build-test.sh @@ -20,14 +20,12 @@ initHostDistroRid() elif [ -e /etc/os-release ]; then source /etc/os-release if [[ $ID == "alpine" ]]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} + __HostDistroRid="linux-musl-$__HostArch" else __PortableBuild=1 + __HostDistroRid="$ID.$VERSION_ID-$__HostArch" fi - - __HostDistroRid="$ID.$VERSION_ID-$__HostArch" - fi + fi elif [ "$__HostOS" == "FreeBSD" ]; then __freebsd_version=`sysctl -n kern.osrelease | cut -f1 -d'.'` __HostDistroRid="freebsd.$__freebsd_version-$__HostArch" @@ -66,11 +66,14 @@ initHostDistroRid() if [ "$__HostOS" == "Linux" ]; then if [ -e /etc/os-release ]; then source /etc/os-release - if [[ $ID == "alpine" || $ID == "rhel" ]]; then + if [[ $ID == "rhel" ]]; then # remove the last version digit VERSION_ID=${VERSION_ID%.*} fi __HostDistroRid="$ID.$VERSION_ID-$__HostArch" + if [[ $ID == "alpine" ]]; then + __HostDistroRid="linux-musl-$__HostArch" + fi elif [ -e /etc/redhat-release ]; then local redhatRelease=$(</etc/redhat-release) if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then diff --git a/buildpipeline/alpine.3.6.groovy b/buildpipeline/linux-musl.groovy index d82ae726c0..d82ae726c0 100644 --- a/buildpipeline/alpine.3.6.groovy +++ b/buildpipeline/linux-musl.groovy diff --git a/buildpipeline/pipelinejobs.groovy b/buildpipeline/pipelinejobs.groovy index af85f51fe8..75b26d100d 100644 --- a/buildpipeline/pipelinejobs.groovy +++ b/buildpipeline/pipelinejobs.groovy @@ -14,10 +14,10 @@ def branch = GithubBranchName // will have a trigger that can be // ************************** -def alpine36Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/alpine.3.6.groovy') +def linmuslPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux-musl.groovy') def configurations = [ - ['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']], ] configurations.each { config -> diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index cf1df6d0b7..f930c90ce5 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -46,20 +46,6 @@ "Name": "DotNet-CoreClr-Trusted-Linux", "Parameters": { "DockerTag": "alpine-3.6-3148f11-20171119021156", - "Rid": "alpine.3.6", - "PB_AdditionalBuildArgs": "-portablebuild=false" - }, - "ReportingParameters": { - "OperatingSystem": "Alpine3.6", - "Type": "build/product/", - "Architecture": "x64", - "PB_BuildType": null - } - }, - { - "Name": "DotNet-CoreClr-Trusted-Linux", - "Parameters": { - "DockerTag": "alpine-3.6-3148f11-20171119021156", "Rid": "linux-musl", "PB_OutputRID": "linux-musl-x64", "PB_AdditionalBuildArgs": "-portablebuild=false" diff --git a/init-tools.sh b/init-tools.sh index 2642a896f6..16c202cf2f 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=$(</etc/redhat-release) diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 253adeb3f4..4163f14300 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -135,7 +135,6 @@ <OfficialBuildRID Include="linux-x64" /> <OfficialBuildRID Include="linux-musl-x64" /> <OfficialBuildRID Include="rhel.6-x64" /> - <OfficialBuildRID Include="alpine.3.6-x64" /> <OfficialBuildRID Include="linux-arm"> <Platform>arm</Platform> </OfficialBuildRID> |