mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-16 15:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Justin M. Keyes
2020-08-30 14:03:33 -07:00
committed by GitHub
parent c6648fe882 65b2fce787
commit b3f5083b8d
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

1
ci/snap/install.sh
View File

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

2
ci/snap/script.sh
View File

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

8
snap/snapcraft.yaml
View File

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