Skip to content

Commit 41de28b

Browse files
committed
Remove Alpine 3.6 builds
The alpine 3.6 builds have been replaced with the more generic linux-musl builds so removing them.
1 parent 05a2f5f commit 41de28b

File tree

8 files changed

+14
-27
lines changed

8 files changed

+14
-27
lines changed

build-packages.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ initHostDistroRid()
1616
if [ "$__HostOS" == "Linux" ]; then
1717
if [ -e /etc/os-release ]; then
1818
source /etc/os-release
19-
if [[ $ID == "alpine" || $ID == "rhel" ]]; then
19+
if [[ $ID == "rhel" ]]; then
2020
# remove the last version digit
2121
VERSION_ID=${VERSION_ID%.*}
2222
fi
2323
__HostDistroRid="$ID.$VERSION_ID-$__Arch"
24+
if [[ $ID == "alpine" ]]; then
25+
__HostDistroRid="linux-musl-$__Arch"
26+
fi
2427
elif [ -e /etc/redhat-release ]; then
2528
local redhatRelease=$(</etc/redhat-release)
2629
if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then

build-test.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@ initHostDistroRid()
2020
elif [ -e /etc/os-release ]; then
2121
source /etc/os-release
2222
if [[ $ID == "alpine" ]]; then
23-
# remove the last version digit
24-
VERSION_ID=${VERSION_ID%.*}
23+
__HostDistroRid="linux-musl-$__HostArch"
2524
else
2625
__PortableBuild=1
26+
__HostDistroRid="$ID.$VERSION_ID-$__HostArch"
2727
fi
28-
29-
__HostDistroRid="$ID.$VERSION_ID-$__HostArch"
30-
fi
28+
fi
3129
elif [ "$__HostOS" == "FreeBSD" ]; then
3230
__freebsd_version=`sysctl -n kern.osrelease | cut -f1 -d'.'`
3331
__HostDistroRid="freebsd.$__freebsd_version-$__HostArch"

build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,14 @@ initHostDistroRid()
6666
if [ "$__HostOS" == "Linux" ]; then
6767
if [ -e /etc/os-release ]; then
6868
source /etc/os-release
69-
if [[ $ID == "alpine" || $ID == "rhel" ]]; then
69+
if [[ $ID == "rhel" ]]; then
7070
# remove the last version digit
7171
VERSION_ID=${VERSION_ID%.*}
7272
fi
7373
__HostDistroRid="$ID.$VERSION_ID-$__HostArch"
74+
if [[ $ID == "alpine" ]]; then
75+
__HostDistroRid="linux-musl-$__HostArch"
76+
fi
7477
elif [ -e /etc/redhat-release ]; then
7578
local redhatRelease=$(</etc/redhat-release)
7679
if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
File renamed without changes.

buildpipeline/pipelinejobs.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ def branch = GithubBranchName
1414
// will have a trigger that can be
1515
// **************************
1616

17-
def alpine36Pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/alpine.3.6.groovy')
17+
def linmuslPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux-musl.groovy')
1818

1919
def configurations = [
20-
['TGroup':"netcoreapp", 'Pipeline':alpine36Pipeline, 'Name':'Alpine.3.6' ,'ForPR':"Debug-x64", 'Arch':['x64']],
20+
['TGroup':"netcoreapp", 'Pipeline':linmuslPipeline, 'Name':'Linux-musl' ,'ForPR':"Debug-x64", 'Arch':['x64']],
2121
]
2222

2323
configurations.each { config ->

buildpipeline/pipelines.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,6 @@
4242
"PB_BuildType": null
4343
}
4444
},
45-
{
46-
"Name": "DotNet-CoreClr-Trusted-Linux",
47-
"Parameters": {
48-
"DockerTag": "alpine-3.6-3148f11-20171119021156",
49-
"Rid": "alpine.3.6",
50-
"PB_AdditionalBuildArgs": "-portablebuild=false"
51-
},
52-
"ReportingParameters": {
53-
"OperatingSystem": "Alpine3.6",
54-
"Type": "build/product/",
55-
"Architecture": "x64",
56-
"PB_BuildType": null
57-
}
58-
},
5945
{
6046
"Name": "DotNet-CoreClr-Trusted-Linux",
6147
"Parameters": {

init-tools.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ if [ ! -e "$__DOTNET_PATH" ]; then
9494
if [ -e /etc/os-release ]; then
9595
source /etc/os-release
9696
if [[ $ID == "alpine" ]]; then
97-
# remove the last version digit
98-
VERSION_ID=${VERSION_ID%.*}
99-
__PKG_RID=alpine.$VERSION_ID
97+
__PKG_RID=linux-musl
10098
fi
10199
elif [ -e /etc/redhat-release ]; then
102100
redhatRelease=$(</etc/redhat-release)

src/.nuget/dir.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
<OfficialBuildRID Include="linux-x64" />
136136
<OfficialBuildRID Include="linux-musl-x64" />
137137
<OfficialBuildRID Include="rhel.6-x64" />
138-
<OfficialBuildRID Include="alpine.3.6-x64" />
139138
<OfficialBuildRID Include="linux-arm">
140139
<Platform>arm</Platform>
141140
</OfficialBuildRID>

0 commit comments

Comments
 (0)