From 160a067c812ef127a3a06e4cdc9278b6108bb205 Mon Sep 17 00:00:00 2001
From: Anthony Fok <foka@debian.org>
Date: Tue, 30 Aug 2022 03:52:16 -0600
Subject: snap: Use "snapcraftctl set-grade"

This, together with 'snapcraftctl set-version", negates the need to
modify snap/snapcraft.yaml upon each release, so the corresponding code
is removed from releaser/releaser.go.

Also, vendorInfo is extended to include the snap version number.

See #10225
---
 releaser/releaser.go | 10 ----------
 snap/snapcraft.yaml  |  8 ++++++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/releaser/releaser.go b/releaser/releaser.go
index afb5079a1..3d00e3a22 100644
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -147,16 +147,6 @@ func (r *ReleaseHandler) bumpVersions(ver hugo.Version) error {
 		return err
 	}
 
-	snapcraftGrade := "stable"
-	if ver.Suffix != "" {
-		snapcraftGrade = "devel"
-	}
-	if err := r.replaceInFile("snap/snapcraft.yaml",
-		`version: "(.*)"`, fmt.Sprintf(`version: "%s"`, ver),
-		`grade: (.*) #`, fmt.Sprintf(`grade: %s #`, snapcraftGrade)); err != nil {
-		return err
-	}
-
 	var minVersion string
 	if ver.Suffix != "" {
 		// People use the DEV version in daily use, and we cannot create new themes
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 64083bcc4..c09eb98ae 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,7 +10,6 @@ description: |
 license: "Apache-2.0"
 base: core20
 confinement: strict
-grade: devel # "devel" or "stable"
 adopt-info: hugo
 
 package-repositories:
@@ -80,6 +79,11 @@ parts:
     override-pull: |
       snapcraftctl pull
       snapcraftctl set-version "$(git describe --tags --always --match 'v[0-9]*' | sed 's/^v//; s/-/+git/; s/-g/./')"
+      if grep -q 'Suffix:\s*""' common/hugo/version_current.go; then
+        snapcraftctl set-grade "stable"
+      else
+        snapcraftctl set-grade "devel"
+      fi
     override-build: |
       echo "\nStarting override-build:"
       set -ex
@@ -104,7 +108,7 @@ parts:
       fi
 
       echo " * Building hugo (HUGO_BUILD_TAGS=\"$HUGO_BUILD_TAGS\")..."
-      go build -v -ldflags '-X github.com/gohugoio/hugo/common/hugo.vendorInfo=snap' -tags "$HUGO_BUILD_TAGS"
+      go build -v -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=snap:$(git describe --tags --always --match 'v[0-9]*' | sed 's/^v//; s/-/+git/; s/-g/./')" -tags "$HUGO_BUILD_TAGS"
       ./hugo version
       ldd hugo || :
 
-- 
cgit v1.2.3