Skip to content

Commit 8269463

Browse files
wtgodbedougbu
andauthored
Use Ubuntu18.04 (#31620)
* Use Ubuntu18.04 * Update .azure/pipelines/jobs/default-build.yml Co-authored-by: Doug Bunting <[email protected]> * Undo queue updates Co-authored-by: Doug Bunting <[email protected]>
1 parent 79dbbca commit 8269463

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.azure/pipelines/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ stages:
566566
jobDisplayName: "Build: Linux Musl ARM64"
567567
agentOs: Linux
568568
useHostedUbuntu: false
569-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a
569+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20210311173921-b2c2436
570570
buildScript: ./build.sh
571571
buildArgs:
572572
--arch arm64
@@ -680,7 +680,7 @@ stages:
680680
parameters:
681681
condition: ne(variables['SkipTests'], 'true')
682682
jobName: Linux_Test
683-
jobDisplayName: "Test: Ubuntu 16.04 x64"
683+
jobDisplayName: "Test: Ubuntu 18.04 x64"
684684
agentOs: Linux
685685
isTestingJob: true
686686
useHostedUbuntu: false
@@ -734,12 +734,15 @@ stages:
734734
displayName: 'Test: Linux Source Build'
735735
container: centos:7
736736
pool:
737-
vmImage: 'ubuntu-16.04'
737+
vmImage: 'ubuntu-18.04'
738738
variables:
739739
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
740740
# This isn't needed in the path because build does not need to _use_ global tools.
741741
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
742742
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
743+
LC_ALL: 'en_US.UTF-8'
744+
LANG: 'en_US.UTF-8'
745+
LANGUAGE: 'en_US.UTF-8'
743746
steps:
744747
- script: |
745748
source eng/common/native/common-library.sh

.azure/pipelines/jobs/default-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
vmImage: macOS-10.14
9696
${{ if eq(parameters.agentOs, 'Linux') }}:
9797
${{ if eq(parameters.useHostedUbuntu, true) }}:
98-
vmImage: ubuntu-16.04
98+
vmImage: ubuntu-18.04
9999
${{ if eq(parameters.useHostedUbuntu, false) }}:
100100
${{ if eq(variables['System.TeamProject'], 'public') }}:
101101
name: NetCorePublic-Pool
@@ -139,6 +139,9 @@ jobs:
139139
- _SignType: real
140140
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
141141
- _SignType: test
142+
- LC_ALL: 'en_US.UTF-8'
143+
- LANG: 'en_US.UTF-8'
144+
- LANGUAGE: 'en_US.UTF-8'
142145
steps:
143146
- ${{ if ne(parameters.agentOs, 'Windows') }}:
144147
- script: df -h

0 commit comments

Comments
 (0)