From 3a4b27e5ff283d1d90c8667f029d56d85f79866f Mon Sep 17 00:00:00 2001 From: Raluca Chis Date: Wed, 6 Jul 2022 16:44:15 +0300 Subject: [PATCH] CI:add new YAML VM Images Signed-off-by: Raluca Chis --- CI/azure/prepare_assets.sh | 8 ++++---- artifact_manifest.txt.cmakein | 6 ++++++ azure-pipelines.yml | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CI/azure/prepare_assets.sh b/CI/azure/prepare_assets.sh index c96c0be7b..445b3f89f 100755 --- a/CI/azure/prepare_assets.sh +++ b/CI/azure/prepare_assets.sh @@ -1,7 +1,7 @@ #!/bin/bash -e release_artifacts() { - local deb_linux_assets='Fedora-34 Ubuntu-18.04 Ubuntu-20.04' + local deb_linux_assets='Fedora-34 Ubuntu-18.04 Ubuntu-20.04 Ubuntu-22.04' cd "${BUILD_ARTIFACTSTAGINGDIRECTORY}" for i in $deb_linux_assets; do cd "Linux-${i}" @@ -13,7 +13,7 @@ release_artifacts() { rm -r "Linux-${i}" done - local pkg_assets='macOS-10.15 macOS-11' + local pkg_assets='macOS-10.15 macOS-11 macOS-12' cd "${BUILD_ARTIFACTSTAGINGDIRECTORY}" for i in $pkg_assets; do cd "${i}" @@ -49,7 +49,7 @@ release_artifacts() { } swdownloads_artifacts() { - local linux_dist='Fedora-34 Ubuntu-18.04 Ubuntu-20.04' + local linux_dist='Fedora-34 Ubuntu-18.04 Ubuntu-20.04 Ubuntu-22.04' for distribution in $linux_dist; do cd "${BUILD_ARTIFACTSTAGINGDIRECTORY}/Linux-${distribution}" if [ "${distribution}" == "Fedora-34" ]; then @@ -60,7 +60,7 @@ swdownloads_artifacts() { rm -r ../Linux-"${distribution}" done - local macOS_dist='macOS-10.15 macOS-11' + local macOS_dist='macOS-10.15 macOS-11 macOS-12' for distribution in $macOS_dist; do cd "${BUILD_ARTIFACTSTAGINGDIRECTORY}/${distribution}" find . -name '*.pkg' -exec mv {} ../"${distribution}_latest_master_libiio.pkg" ";" diff --git a/artifact_manifest.txt.cmakein b/artifact_manifest.txt.cmakein index 65d67085b..849dc25af 100644 --- a/artifact_manifest.txt.cmakein +++ b/artifact_manifest.txt.cmakein @@ -10,12 +10,18 @@ Linux-Ubuntu-18.04/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Linux-Ubuntu-18.04.tar Linux-Ubuntu-20.04/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Linux-Ubuntu-20.04.deb Linux-Ubuntu-20.04/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Linux-Ubuntu-20.04.tar.gz +Linux-Ubuntu-22.04/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Linux-Ubuntu-22.04.deb +Linux-Ubuntu-22.04/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Linux-Ubuntu-22.04.tar.gz + macOS-10.15/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-macOS-10.15.tar.gz macOS-10.15/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@.pkg macOS-11/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-macOS-11.tar.gz macOS-11/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@.pkg +macOS-12/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-macOS-12.tar.gz +macOS-12/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@.pkg + Ubuntu-arm32v7/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Ubuntu-arm32v7.deb Ubuntu-arm32v7/libiio-@VERSION@.g@LIBIIO_VERSION_GIT@-Ubuntu-arm32v7.tar.gz diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcffb5ecc..f508e888c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,6 +38,9 @@ stages: ubuntu_20_04: image: 'tfcollins/libiio_ubuntu_20_04-ci:latest' artifactName: 'Linux-Ubuntu-20.04' + ubuntu_22_04: + image: 'tfcollins/libiio_ubuntu_22_04-ci:latest' + artifactName: 'Linux-Ubuntu-22.04' fedora34: image: 'tfcollins/libiio_fedora_34-ci:latest' artifactName: 'Linux-Fedora-34' @@ -184,6 +187,9 @@ stages: macOS_11: vmImage: 'macOS-11' artifactName: 'macOS-11' + macOS_12: + vmImage: 'macOS-12' + artifactName: 'macOS-12' pool: vmImage: $[ variables['vmImage'] ] steps: