diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/snap/install.sh | 1 | ||||
| -rwxr-xr-x | ci/snap/script.sh | 2 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 8 |
4 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index b920f70f45..34ff492bb6 100644 --- a/.travis.yml +++ b/.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 diff --git a/ci/snap/install.sh b/ci/snap/install.sh index 23e0bc5eb8..0ceb6f0422 100755 --- a/ci/snap/install.sh +++ b/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 diff --git a/ci/snap/script.sh b/ci/snap/script.sh index 647cda4874..f0d45fea00 100755 --- a/ci/snap/script.sh +++ b/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 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index da3e74d3e7..7d1e7bdbb0 100644 --- a/snap/snapcraft.yaml +++ b/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 |