From 49ef27db7cfbeb161997d851614549a52677753b Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Thu, 8 Sep 2022 14:21:08 +0100 Subject: [snapcraft] Update base to core22 core20 has python3-magic 0.4.15, and hence the binary detection will not work by default. Moving to core22 goes to 0.4.24-2 which would mean this would work nevertheless. This also means migrating to using craftctl instead of snapcraftctl. Snap build now needs to be done on 22.04, as it core22, so chaging the snap build for cirrus to the corresponding image. The version cannot be set now if adopt-info is not there, so removing this for the cirrus tests. Signed-off-by: Arif Ali --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 7ca462fd..ac26703d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -117,13 +117,13 @@ snap_build_task: name: "snap Build From Checkout" gce_instance: image_project: "${UBUNTU_PROJECT}" - image_name: "${UBUNTU_PRIOR_IMAGE_NAME}" + image_name: "${UBUNTU_IMAGE_NAME}" type: e2-medium setup_script: | apt update apt -y install snapd systemctl start snapd - sed -i 's/adopt-info.*/version: test/g' snap/snapcraft.yaml + sed -i -e 's/adopt-info.*/version: test/g' -e '/set version/d' snap/snapcraft.yaml snap install snapcraft --classic main_script: | snapcraft --destructive-mode -- cgit