github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

snap: Use "snapcraftctl set-grade"

Browse source 
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
This commit is contained in:
Anthony Fok 2022-08-30 03:52:16 -06:00 committed by Anthony Fok
parent e0ba1a805a
commit 160a067c81
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
releaser/releaser.go
View file

@ -147,16 +147,6 @@ func (r *ReleaseHandler) bumpVersions(ver hugo.Version) error {
return err 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 var minVersion string
if ver.Suffix != "" { if ver.Suffix != "" {
// People use the DEV version in daily use, and we cannot create new themes // People use the DEV version in daily use, and we cannot create new themes

8
snap/snapcraft.yaml
View file

@ -10,7 +10,6 @@ description: |
license: "Apache-2.0" license: "Apache-2.0"
base: core20 base: core20
confinement: strict confinement: strict
grade: devel # "devel" or "stable"
adopt-info: hugo adopt-info: hugo
package-repositories: package-repositories:
@ -80,6 +79,11 @@ parts:
override-pull: | override-pull: |
snapcraftctl pull snapcraftctl pull
snapcraftctl set-version "$(git describe --tags --always --match 'v[0-9]*' | sed 's/^v//; s/-/+git/; s/-g/./')" 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: | override-build: |
echo "\nStarting override-build:" echo "\nStarting override-build:"
set -ex set -ex
@ -104,7 +108,7 @@ parts:
fi fi
echo " * Building hugo (HUGO_BUILD_TAGS=\"$HUGO_BUILD_TAGS\")..." 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 ./hugo version
ldd hugo || : ldd hugo || :