From eaa645b58451c19c1fb22a0ea3e7159d01ebb507 Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 11 Aug 2022 17:19:42 -0400 Subject: [PATCH] use Ubuntu-latest everywhere --- scripts/mk_nuget_task.py | 3 ++- scripts/nightly.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py index 75d26a1c5..dd81349df 100644 --- a/scripts/mk_nuget_task.py +++ b/scripts/mk_nuget_task.py @@ -21,7 +21,8 @@ def mk_dir(d): if not os.path.exists(d): os.makedirs(d) -os_info = { 'ubuntu-18' : ('so', 'linux-x64'), +os_info = { 'ubuntu-latest' : ('so', 'linux-x64'), + 'ubuntu-18' : ('so', 'linux-x64'), 'ubuntu-20' : ('so', 'linux-x64'), 'glibc-2.31' : ('so', 'linux-x64'), 'x64-win' : ('dll', 'win-x64'), diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 221ade46b..cff46b6b3 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -92,7 +92,7 @@ stages: name: ManyLinux displayName: "ManyLinux build" pool: - vmImage: "Ubuntu-18.04" + vmImage: "ubuntu-latest" container: "quay.io/pypa/manylinux2010_x86_64:latest" steps: - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava @@ -111,7 +111,7 @@ stages: # name: MuslLinux # displayName: "MuslLinux build" # pool: -# vmImage: "Ubuntu-18.04" +# vmImage: "Ubuntu-latest" # container: "quay.io/pypa/musllinux_1_1_x86_64:latest" # steps: # - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava