Skip to content

Commit

Permalink
Merge pull request Vimjas#56 from blueyed/alpine38
Browse files Browse the repository at this point in the history
Update to Alpine 3.8
  • Loading branch information
blueyed authored Jul 23, 2018
2 parents 02735ab + 28c3d78 commit e3679d8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.8

RUN apk --no-cache upgrade

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build push test

TAG:=10
TAG:=11

build:
docker build -t testbed/vim:$(TAG) .
Expand Down
15 changes: 12 additions & 3 deletions scripts/install_vim.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ EOF
if [ $LUA -eq 1 ]; then
if [ "$FLAVOR" = vim ]; then
CONFIG_ARGS="$CONFIG_ARGS --enable-luainterp"
apk add --virtual vim-build lua-dev
apk add lua
apk add --virtual vim-build lua5.3-dev
apk add lua5.3-libs
else
echo 'NOTE: -lua is automatically used with Neovim 0.2.1+, and not supported before.'
fi
Expand Down Expand Up @@ -199,10 +199,19 @@ build() {
make install || bail "Install failed"

elif [ "$FLAVOR" = neovim ]; then
DEPS_CMAKE_FLAGS="-DUSE_BUNDLED=OFF"

# Use bundled unibilium with older releases that data directly, and not
# through unibi_var_from_num like it is required now.
if ! grep -qF 'unibi_var_from_num' src/nvim/tui/tui.c; then
DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_UNIBILIUM=ON"
fi

head_info=$(curl --retry 3 -SL "https://api.github.com/repos/$repo/git/refs/heads/$tag")
make CMAKE_BUILD_TYPE=RelWithDebInfo \
CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-DENABLE_JEMALLOC=OFF" \
DEPS_CMAKE_FLAGS="-DUSE_BUNDLED=OFF" \
DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS" \
|| bail "Make failed"

versiondef_file=build/config/auto/versiondef.h
Expand Down

0 comments on commit e3679d8

Please sign in to comment.