From 0e2ebd217939fc5c689f67af6a19a405ceb49b06 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 13 Dec 2023 17:36:22 -0500 Subject: [PATCH 1/4] cli/snapcraft: switch to core22 base Signed-off-by: Simon Deziel --- cli/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/snapcraft.yaml b/cli/snapcraft.yaml index df4c0e2c..6bec6b69 100644 --- a/cli/snapcraft.yaml +++ b/cli/snapcraft.yaml @@ -5,7 +5,7 @@ description: | server for submitting test jobs, checking status, getting results, and streaming output. confinement: strict -base: core20 +base: core22 adopt-info: testflinger-cli architectures: From c362be6731814fc9e596e9d51d0fc9fb4a54af82 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 13 Dec 2023 17:36:42 -0500 Subject: [PATCH 2/4] cli/snapcraft: use craftctl for modern base Signed-off-by: Simon Deziel --- cli/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/snapcraft.yaml b/cli/snapcraft.yaml index 6bec6b69..192ffb3b 100644 --- a/cli/snapcraft.yaml +++ b/cli/snapcraft.yaml @@ -31,6 +31,6 @@ parts: source: . override-pull: | set -e - snapcraftctl pull - snapcraftctl set-version "$(date +%Y%m%d)" - snapcraftctl set-grade "stable" + craftctl default + craftctl set-version "$(date +%Y%m%d)" + craftctl set-grade "stable" From 55b459c3017e3a5ee7746e97a857e646c8788c81 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 13 Dec 2023 17:39:59 -0500 Subject: [PATCH 3/4] cli/snapcraft: set the grade at the top-level Signed-off-by: Simon Deziel --- cli/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/snapcraft.yaml b/cli/snapcraft.yaml index 192ffb3b..27cbc493 100644 --- a/cli/snapcraft.yaml +++ b/cli/snapcraft.yaml @@ -6,6 +6,7 @@ description: | streaming output. confinement: strict base: core22 +grade: stable adopt-info: testflinger-cli architectures: @@ -33,4 +34,3 @@ parts: set -e craftctl default craftctl set-version "$(date +%Y%m%d)" - craftctl set-grade "stable" From 8269f5238b6bc1015434b1aa7d3ab58dffc7e913 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 13 Dec 2023 17:57:05 -0500 Subject: [PATCH 4/4] cli/snapcraft: fix how the version is set Signed-off-by: Simon Deziel --- cli/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/snapcraft.yaml b/cli/snapcraft.yaml index 27cbc493..a7fc3ae5 100644 --- a/cli/snapcraft.yaml +++ b/cli/snapcraft.yaml @@ -33,4 +33,4 @@ parts: override-pull: | set -e craftctl default - craftctl set-version "$(date +%Y%m%d)" + craftctl set version="$(date +%Y%m%d)"