Skip to content

Commit 601df38

Browse files
authored
snap: Update to core 24
1 parent 3bed212 commit 601df38

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

‎snap/snapcraft.yaml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: hugo
2-
base: core22
2+
base: core24
33
confinement: strict
44
adopt-info: hugo
55
title: Hugo
@@ -29,6 +29,15 @@ license: "Apache-2.0"
2929
source-code: https://github.com/gohugoio/hugo.git
3030
website: https://gohugo.io/
3131

32+
lint:
33+
ignore:
34+
- library:
35+
- usr/lib/**/libform.so.*
36+
- usr/lib/**/liblua*.so.*
37+
- usr/lib/**/libmenu.so.*
38+
- usr/lib/**/libpanel.so.*
39+
- usr/lib/**/libperl.so.*
40+
3241
plugs:
3342
etc-gitconfig:
3443
interface: system-files
@@ -68,12 +77,13 @@ environment:
6877
npm_config_userconfig: $SNAP_USER_DATA/.npmrc
6978
pandoc_datadir: $SNAP/usr/share/pandoc
7079
PYTHONHOME: /usr:$SNAP/usr
71-
RUBYLIB: $SNAP/usr/lib/ruby/vendor_ruby/3.0.0:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/ruby/vendor_ruby/3.0.0:$SNAP/usr/lib/ruby/vendor_ruby:$SNAP/usr/lib/ruby/3.0.0:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/ruby/3.0.0
80+
RUBYLIB: $SNAP/usr/lib/ruby/vendor_ruby/3.2.0:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/ruby/vendor_ruby/3.2.0:$SNAP/usr/lib/ruby/vendor_ruby:$SNAP/usr/lib/ruby/3.2.0:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/ruby/3.2.0
7281

7382
# HUGO_SECURITY_EXEC_OSENV
7483
#
7584
# Default value:
7685
# (?i)^((HTTPS?|NO)_PROXY|PATH(EXT)?|APPDATA|TE?MP|TERM|GO\w+|(XDG_CONFIG_)?HOME|USERPROFILE|SSH_AUTH_SOCK|DISPLAY|LANG|SYSTEMDRIVE|PROGRAMDATA)$
86+
#
7787
# Bundled applications require additional access:
7888
# git: GIT_EXEC_PATH and LD_LIBRARY_PATH
7989
# npx: npm_config_{cache,init_module,userconfig}
@@ -123,6 +133,8 @@ parts:
123133
after:
124134
- git
125135
- go
136+
build-packages:
137+
- git
126138
override-pull: |
127139
craftctl default
128140
craftctl set version=$(git describe --tags --always --match 'v[0-9]*' | sed 's/^v//; s/-/+git/; s/-g/./')
@@ -140,7 +152,7 @@ parts:
140152
141153
HUGO_BUILD_TAGS="extended"
142154
echo " * Building hugo (HUGO_BUILD_TAGS=\"$HUGO_BUILD_TAGS\")..."
143-
go build -v -ldflags "-s -w -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"
155+
go build -v -ldflags "-s -w -X github.com/gohugoio/hugo/common/hugo.vendorInfo=snap:$(craftctl get version)" -tags "$HUGO_BUILD_TAGS"
144156
./hugo version
145157
ldd hugo || :
146158
@@ -181,7 +193,6 @@ parts:
181193
amd64) arch=x64 ;;
182194
arm64) arch=arm64 ;;
183195
armhf) arch=arm ;;
184-
i386) arch=ia32 ;;
185196
*) arch="" ;;
186197
esac
187198
if [[ -n $arch ]]; then
@@ -195,7 +206,7 @@ parts:
195206
node:
196207
plugin: nil
197208
stage-snaps:
198-
- node/22/stable
209+
- node/24/stable
199210
organize:
200211
"LICENSE": "LICENSE_NODE" # rename to prevent conflict with Go snap
201212
"README.md": "README_NODE.md" # rename to prevent conflict with Go snap

0 commit comments

Comments
 (0)