Skip to content

Commit 365af5f

Browse files
Update SB CI to alpine 3.20 (#42119)
1 parent b2cadd7 commit 365af5f

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ stages:
125125
- template: ../jobs/vmr-build.yml
126126
parameters:
127127
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
128-
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpineName) }}
128+
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpinePreviousName) }}
129129
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
130130
vmrBranch: ${{ variables.VmrBranch }}
131131
architecture: x64
132-
artifactsRid: ${{ variables.alpineX64Rid }}
132+
artifactsRid: ${{ variables.alpinePreviousX64Rid }}
133133
pool: ${{ parameters.pool_Linux }}
134-
container: ${{ variables.alpineContainer }}
135-
extraProperties: /p:TargetRID=${{ variables.alpineX64Rid }}
134+
container: ${{ variables.alpinePreviousContainer }}
135+
extraProperties: /p:TargetRID=${{ variables.alpinePreviousX64Rid }}
136136
buildFromArchive: false # 🚫
137137
buildSourceOnly: true #
138138
enablePoison: true #
@@ -166,13 +166,13 @@ stages:
166166
- template: ../jobs/vmr-build.yml
167167
parameters:
168168
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
169-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineName) }}
169+
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
170170
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
171171
vmrBranch: ${{ variables.VmrBranch }}
172172
architecture: x64
173173
pool: ${{ parameters.pool_Linux }}
174-
container: ${{ variables.alpineContainer }}
175-
extraProperties: /p:TargetRID=${{ variables.alpineX64Rid }}
174+
container: ${{ variables.alpineLatestContainer }}
175+
extraProperties: /p:TargetRID=${{ variables.alpineLatestX64Rid }}
176176
buildFromArchive: false # 🚫
177177
buildSourceOnly: true #
178178
enablePoison: false # 🚫

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ variables:
1414

1515
- name: almaLinuxContainer
1616
value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
17-
- name: alpineContainer
17+
- name: alpineLatestContainer
18+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
19+
- name: alpinePreviousContainer
1820
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
1921
- name: centOSStreamContainer
2022
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
@@ -47,7 +49,9 @@ variables:
4749

4850
- name: almaLinuxName
4951
value: AlmaLinux8
50-
- name: alpineName
52+
- name: alpineLatestName
53+
value: Alpine320
54+
- name: alpinePreviousName
5155
value: Alpine319
5256
- name: centOSStreamName
5357
value: CentOSStream9
@@ -58,7 +62,9 @@ variables:
5862

5963
- name: almaLinuxX64Rid
6064
value: almalinux.8-x64
61-
- name: alpineX64Rid
65+
- name: alpineLatestX64Rid
66+
value: alpine.3.20-x64
67+
- name: alpinePreviousX64Rid
6268
value: alpine.3.19-x64
6369
- name: centOSStreamX64Rid
6470
value: centos.9-x64

src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858

5959
- template: templates/jobs/sdk-diff-tests.yml
6060
parameters:
61-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineName) }}
62-
targetRid: ${{ variables.alpineX64Rid }}
61+
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
62+
targetRid: ${{ variables.alpineLatestX64Rid }}
6363
architecture: x64
6464
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
6565

0 commit comments

Comments
 (0)