diff options
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
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 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 92b7949e..8af14486 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,7 +5,7 @@ description: | primarily aimed at Linux distributions and other UNIX-like operating systems. grade: stable -base: core20 +base: core22 confinement: classic adopt-info: sos @@ -14,8 +14,8 @@ parts: plugin: python source: . override-pull: | - snapcraftctl pull - snapcraftctl set-version $(git describe --tags --always) + craftctl default + craftctl set version="$(git describe --tags --always)" build-packages: - git - python3 |