Merge #12815 'snap: update, fix build issues'

.travis.yml

@@ -193,6 +193,7 @@ jobs:
         - LANG: C.UTF-8
         - SNAPCRAFT_ENABLE_SILENT_REPORT: y
         - SNAPCRAFT_ENABLE_DEVELOPER_DEBUG: y
+        - SNAPCRAFT_BUILD_ENVIRONMENT: lxd
       addons:
         snaps:
           - name: snapcraft
@@ -221,6 +222,7 @@ jobs:
       - LANG: C.UTF-8
       - SNAPCRAFT_ENABLE_SILENT_REPORT: y
       - SNAPCRAFT_ENABLE_DEVELOPER_DEBUG: y
+      - SNAPCRAFT_BUILD_ENVIRONMENT: lxd
   fast_finish: true
 
 before_install: ci/before_install.sh

ci/snap/install.sh

@@ -4,6 +4,7 @@ set -e
 set -o pipefail
 
 sudo apt update
+sudo usermod -aG lxd $USER
 sudo /snap/bin/lxd.migrate -yes
 sudo /snap/bin/lxd waitready
 sudo /snap/bin/lxd init --auto

ci/snap/script.sh

@@ -4,5 +4,5 @@ set -e
 set -o pipefail
 
 mkdir -p "$TRAVIS_BUILD_DIR/snaps-cache"
-sudo snapcraft --use-lxd
+sg lxd -c snapcraft
 

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: nvim
-base: core18
+base: core20
 adopt-info: nvim
 summary: Vim-fork focused on extensibility and agility.
 description: |
@@ -37,8 +37,10 @@ parts:
           snapcraftctl set-version "${version_prefix}-${git_described}"
         plugin: make
         make-parameters:
-            - CMAKE_BUILD_TYPE=Release
+            - CMAKE_BUILD_TYPE=RelWithDebInfo
             - CMAKE_INSTALL_PREFIX=/usr
+            - CMAKE_FLAGS=-DPREFER_LUA=ON
+            - DEPS_CMAKE_FLAGS="-DUSE_BUNDLED_LUA=ON -DUSE_BUNDLED_LUAJIT=OFF"
         override-build: |
             snapcraftctl build
             # Fix Desktop file
@@ -52,11 +54,13 @@ parts:
             - autoconf
             - automake
             - cmake
+            - gawk
             - g++
             - git
             - gettext
             - pkg-config
             - unzip
+            - wget
         prime:
             - -usr/share/man