aboutsummaryrefslogtreecommitdiffstats
path: root/.ci/uhd-build-docker-container.yml
diff options
context:
space:
mode:
authorSteven Koo <steven.koo@ni.com>2022-01-20 09:43:59 -0600
committerAaron Rossetto <aaron.rossetto@ni.com>2022-02-04 13:14:22 -0600
commit8c04afbbca4575465d43b99f30eb39c08a0db7ad (patch)
tree993bfbd6fde39fa43ac200d72d60f8fd53de785a /.ci/uhd-build-docker-container.yml
parentde0029073184282af29de39868eafa17f0f36763 (diff)
downloaduhd-8c04afbbca4575465d43b99f30eb39c08a0db7ad.tar.gz
uhd-8c04afbbca4575465d43b99f30eb39c08a0db7ad.tar.bz2
uhd-8c04afbbca4575465d43b99f30eb39c08a0db7ad.zip
ci: Add support for Ubuntu 22.04
Signed-off-by: Steven Koo <steven.koo@ni.com>
Diffstat (limited to '.ci/uhd-build-docker-container.yml')
-rw-r--r--.ci/uhd-build-docker-container.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml
index 1f0a65ef3..55a2a2714 100644
--- a/.ci/uhd-build-docker-container.yml
+++ b/.ci/uhd-build-docker-container.yml
@@ -41,7 +41,8 @@ variables:
"{'Fedora-34-builder':{'buildOSName':'fedora34','dockerImageName':'uhd-builder-fedora34'},
'Fedora-35-builder':{'buildOSName':'fedora35','dockerImageName':'uhd-builder-fedora35'},
'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804'},
- 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'}}"
+ 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'},
+ 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204'}}"
- name: winDockerImages
value:
"{'VS2017-x86-builder':{'buildOSName':'win-vs17-v141-x86','dockerImageName':'uhd-builder-vs2017-v141-x86','cmakeCompiler':'Visual Studio 15 2017','cmakeArch':'Win32','vsArch':'x86','vsYear':'2017'},
@@ -53,7 +54,8 @@ variables:
# Match with Ubuntu images in linuxDockerImages
value:
"{'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804','ubuntuReleaseName':'bionic'},
- 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'}}"
+ 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'},
+ 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204','ubuntuReleaseName':'jammy'}}"
- name: macOSBuilders
value: