Rename scripts -> docker. Make repro more useful.
This commit is contained in:
parent
42956dd140
commit
da6efc3e7d
@ -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="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:
|
||||
- docker build -t ultisnips:${TAG} --build-arg PYTHON_IMAGE=${PYTHON_IMAGE} --build-arg VIM_VERSION=${VIM_VERSION} .
|
||||
|
||||
script:
|
||||
- docker run -it ultisnips:${TAG} scripts/run_tests.sh
|
||||
- scripts/save_docker_cache.sh
|
||||
- docker run -it ultisnips:${TAG} docker/run_tests.sh
|
||||
- docker/save_docker_cache.sh
|
||||
|
||||
notifications:
|
||||
webhooks:
|
||||
|
@ -4,11 +4,11 @@ FROM python:${PYTHON_IMAGE}
|
||||
|
||||
ARG VIM_VERSION
|
||||
|
||||
COPY scripts/install_packages.sh src/scripts/
|
||||
COPY docker/install_packages.sh src/scripts/
|
||||
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
|
||||
COPY scripts/build_vim.sh src/scripts/
|
||||
COPY docker/build_vim.sh src/scripts/
|
||||
RUN src/scripts/build_vim.sh
|
||||
|
||||
# We clone the plugins we currently depend on manually here. Initially we check
|
||||
|
@ -5,6 +5,7 @@ FROM ultisnips:${BASE_IMAGE}
|
||||
RUN curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
|
||||
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'
|
||||
|
||||
ADD docker/snippets /root/.vim/UltiSnips
|
||||
|
2
Makefile
2
Makefile
@ -20,7 +20,7 @@ image_repro: image_vim_80_py3
|
||||
|
||||
# A reproduction image that drops you into a naked environment,
|
||||
# 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.
|
||||
repro:
|
||||
docker run -it -v ${MAKEFILE_DIR}:/src/UltiSnips ultisnips:repro /bin/bash
|
||||
|
3
docker/snippets/all.snippets
Normal file
3
docker/snippets/all.snippets
Normal file
@ -0,0 +1,3 @@
|
||||
snippet example "Repro case example"
|
||||
This is a simple snippet example
|
||||
endsnippet
|
Loading…
Reference in New Issue
Block a user