Rename scripts -> docker. Make repro more useful.

This commit is contained in:
Holger Rapp 2018-04-05 21:52:33 +02:00
parent 42956dd140
commit da6efc3e7d
12 changed files with 13 additions and 9 deletions

View File

@ -15,13 +15,13 @@ env:
- VIM_VERSION="8.0" PYTHON_IMAGE=3.6-stretch TAG=vim_80_py3 DOCKER_CACHE_FILE=/home/travis/docker/vim_80_py3.tar.gz - VIM_VERSION="8.0" PYTHON_IMAGE=3.6-stretch TAG=vim_80_py3 DOCKER_CACHE_FILE=/home/travis/docker/vim_80_py3.tar.gz
- VIM_VERSION="git" PYTHON_IMAGE=3.6-stretch TAG=vim_git_py3 DOCKER_CACHE_FILE=/home/travis/docker/vim_git_py3.tar.gz - VIM_VERSION="git" PYTHON_IMAGE=3.6-stretch TAG=vim_git_py3 DOCKER_CACHE_FILE=/home/travis/docker/vim_git_py3.tar.gz
before_install: scripts/load_docker_cache.sh before_install: docker/load_docker_cache.sh
install: install:
- docker build -t ultisnips:${TAG} --build-arg PYTHON_IMAGE=${PYTHON_IMAGE} --build-arg VIM_VERSION=${VIM_VERSION} . - docker build -t ultisnips:${TAG} --build-arg PYTHON_IMAGE=${PYTHON_IMAGE} --build-arg VIM_VERSION=${VIM_VERSION} .
script: script:
- docker run -it ultisnips:${TAG} scripts/run_tests.sh - docker run -it ultisnips:${TAG} docker/run_tests.sh
- scripts/save_docker_cache.sh - docker/save_docker_cache.sh
notifications: notifications:
webhooks: webhooks:

View File

@ -4,11 +4,11 @@ FROM python:${PYTHON_IMAGE}
ARG VIM_VERSION ARG VIM_VERSION
COPY scripts/install_packages.sh src/scripts/ COPY docker/install_packages.sh src/scripts/
RUN src/scripts/install_packages.sh RUN src/scripts/install_packages.sh
COPY scripts/download_vim.sh src/scripts/ COPY docker/download_vim.sh src/scripts/
RUN src/scripts/download_vim.sh RUN src/scripts/download_vim.sh
COPY scripts/build_vim.sh src/scripts/ COPY docker/build_vim.sh src/scripts/
RUN src/scripts/build_vim.sh RUN src/scripts/build_vim.sh
# We clone the plugins we currently depend on manually here. Initially we check # We clone the plugins we currently depend on manually here. Initially we check

View File

@ -5,6 +5,7 @@ FROM ultisnips:${BASE_IMAGE}
RUN curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ RUN curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
ADD scripts/docker_vimrc.vim /root/.vimrc ADD docker/docker_vimrc.vim /root/.vimrc
RUN vim -c 'PlugInstall | qa' RUN vim -c 'PlugInstall | qa'
ADD docker/snippets /root/.vim/UltiSnips

View File

@ -20,7 +20,7 @@ image_repro: image_vim_80_py3
# A reproduction image that drops you into a naked environment, # A reproduction image that drops you into a naked environment,
# with a Vim having UltiSnips and vim-snippets configured. See # with a Vim having UltiSnips and vim-snippets configured. See
# scripts/docker_vimrc.vim for the full vimrc. Need to run `make # docker/docker_vimrc.vim for the full vimrc. Need to run `make
# image_repro` before this will work. # image_repro` before this will work.
repro: repro:
docker run -it -v ${MAKEFILE_DIR}:/src/UltiSnips ultisnips:repro /bin/bash docker run -it -v ${MAKEFILE_DIR}:/src/UltiSnips ultisnips:repro /bin/bash

View File

@ -0,0 +1,3 @@
snippet example "Repro case example"
This is a simple snippet example
endsnippet