Skip to content

Commit e3679d8

Browse files
authored
Merge pull request Vimjas#56 from blueyed/alpine38
Update to Alpine 3.8
2 parents 02735ab + 28c3d78 commit e3679d8

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.7
1+
FROM alpine:3.8
22

33
RUN apk --no-cache upgrade
44

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: build push test
22

3-
TAG:=10
3+
TAG:=11
44

55
build:
66
docker build -t testbed/vim:$(TAG) .

scripts/install_vim.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ EOF
107107
if [ $LUA -eq 1 ]; then
108108
if [ "$FLAVOR" = vim ]; then
109109
CONFIG_ARGS="$CONFIG_ARGS --enable-luainterp"
110-
apk add --virtual vim-build lua-dev
111-
apk add lua
110+
apk add --virtual vim-build lua5.3-dev
111+
apk add lua5.3-libs
112112
else
113113
echo 'NOTE: -lua is automatically used with Neovim 0.2.1+, and not supported before.'
114114
fi
@@ -199,10 +199,19 @@ build() {
199199
make install || bail "Install failed"
200200

201201
elif [ "$FLAVOR" = neovim ]; then
202+
DEPS_CMAKE_FLAGS="-DUSE_BUNDLED=OFF"
203+
204+
# Use bundled unibilium with older releases that data directly, and not
205+
# through unibi_var_from_num like it is required now.
206+
if ! grep -qF 'unibi_var_from_num' src/nvim/tui/tui.c; then
207+
DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_UNIBILIUM=ON"
208+
fi
209+
210+
head_info=$(curl --retry 3 -SL "https://api.github.com/repos/$repo/git/refs/heads/$tag")
202211
make CMAKE_BUILD_TYPE=RelWithDebInfo \
203212
CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
204213
-DENABLE_JEMALLOC=OFF" \
205-
DEPS_CMAKE_FLAGS="-DUSE_BUNDLED=OFF" \
214+
DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS" \
206215
|| bail "Make failed"
207216

208217
versiondef_file=build/config/auto/versiondef.h

0 commit comments

Comments
 (0)