Skip to content

Commit 88f4664

Browse files
jfleisherNikolajBjorner
authored andcommitted
Standardize ubutu-latest vmImage
1 parent e0aa32e commit 88f4664

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

azure-pipelines.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- job: "LinuxPythonDebug"
2222
displayName: "Ubuntu build - python make - debug"
2323
pool:
24-
vmImage: "Ubuntu-latest"
24+
vmImage: "ubuntu-latest"
2525
strategy:
2626
matrix:
2727
MT:
@@ -102,7 +102,7 @@ jobs:
102102
displayName: "Ubuntu build - cmake"
103103
condition: eq(0,1)
104104
pool:
105-
vmImage: "Ubuntu-latest"
105+
vmImage: "ubuntu-latest"
106106
strategy:
107107
matrix:
108108
msanClang:
@@ -135,7 +135,7 @@ jobs:
135135
- job: "UbuntuCMake"
136136
displayName: "Ubuntu build - cmake"
137137
pool:
138-
vmImage: "Ubuntu-latest"
138+
vmImage: "ubuntu-latest"
139139
strategy:
140140
matrix:
141141
releaseClang:

scripts/jsdoctest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ stages:
1212
- job: UbuntuDoc
1313
displayName: "Ubuntu Doc build"
1414
pool:
15-
vmImage: "Ubuntu-latest"
15+
vmImage: "ubuntu-latest"
1616
steps:
1717
# TODO setup emscripten with no-install, then run
1818
- script: npm --prefix=src/api/js ci

scripts/mk_nuget_task.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ def mk_dir(d):
2121
if not os.path.exists(d):
2222
os.makedirs(d)
2323

24-
os_info = { 'ubuntu-18' : ('so', 'linux-x64'),
24+
os_info = { 'ubuntu-latest' : ('so', 'linux-x64'),
25+
'ubuntu-18' : ('so', 'linux-x64'),
2526
'ubuntu-20' : ('so', 'linux-x64'),
2627
'glibc-2.31' : ('so', 'linux-x64'),
2728
'x64-win' : ('dll', 'win-x64'),

scripts/nightly.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ stages:
5555
- job: UbuntuDoc
5656
displayName: "Ubuntu Doc build"
5757
pool:
58-
vmImage: "Ubuntu-latest"
58+
vmImage: "ubuntu-latest"
5959
steps:
6060
- script: sudo apt-get install ocaml opam libgmp-dev
6161
- script: opam init -y
@@ -92,7 +92,7 @@ stages:
9292
name: ManyLinux
9393
displayName: "ManyLinux build"
9494
pool:
95-
vmImage: "Ubuntu-18.04"
95+
vmImage: "ubuntu-latest"
9696
container: "quay.io/pypa/manylinux2010_x86_64:latest"
9797
steps:
9898
- script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava
@@ -111,7 +111,7 @@ stages:
111111
# name: MuslLinux
112112
# displayName: "MuslLinux build"
113113
# pool:
114-
# vmImage: "Ubuntu-18.04"
114+
# vmImage: "ubuntu-latest"
115115
# container: "quay.io/pypa/musllinux_1_1_x86_64:latest"
116116
# steps:
117117
# - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava

scripts/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ stages:
9191
- job: UbuntuDoc
9292
displayName: "Ubuntu Doc build"
9393
pool:
94-
vmImage: "Ubuntu-latest"
94+
vmImage: "ubuntu-latest"
9595
steps:
9696
- script: sudo apt-get install ocaml opam libgmp-dev
9797
- script: opam init -y

0 commit comments

Comments
 (0)