]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / vim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 64306e4)
tests: use Vim v8.1.0129 to work around Vim bug
authorDaniel Hahler <git@thequod.de>
Tue, 24 Jul 2018 22:59:20 +0000 (00:59 +0200)
committerDaniel Hahler <git@thequod.de>
Tue, 24 Jul 2018 23:07:27 +0000 (01:07 +0200)
This works around a segfault with profiling.

Ref: https://github.com/vim/vim/commit/ad6480961080f80a455b2394f27b02935a2ded52#commitcomment-29790223

.circleci/config.yml patch | blob | history
Dockerfile patch | blob | history
Makefile patch | blob | history

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9df78206c10e83d88432df42524e819b0aa6718..8d54439bda3bb4a6dcf7a415f12e3ad2b24c861d 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 common: &common
   working_directory: ~/repo
   docker:
 common: &common
   working_directory: ~/repo
   docker:
-    - image: blueyed/vim-python-pep8-indent-vims-for-test:2@sha256:a7be5f4d07ed361ce3ca78cedd413d67d583f96ab0a59feb512af89052c50172
+    - image: blueyed/vim-python-pep8-indent-vims-for-test:3@sha256:e7e3c4f4b021954a40f2f1d88dc470f119dc65603c63724d1c58cbe437fdc2d4
 
 jobs:
   test:
 
 jobs:
   test:
diff --git a/Dockerfile b/Dockerfile
index 85d8e2169e94af4ec8bc4b80988f963fe3d208d1..14e39ea133a6da381f8f51a3d32184143ca3765d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@ FROM testbed/vim:latest
 
 RUN apk --no-cache add gtk+2.0-dev libx11-dev libxt-dev mcookie xauth xvfb
 # NOTE: +profile needs huge features.
 
 RUN apk --no-cache add gtk+2.0-dev libx11-dev libxt-dev mcookie xauth xvfb
 # NOTE: +profile needs huge features.
-RUN install_vim -tag master --with-features=huge \
+RUN install_vim -tag v8.1.0129 -name vim --with-features=huge \
   --disable-channel --disable-netbeans --disable-xim \
   --enable-gui=gtk2 --with-x -build
   --disable-channel --disable-netbeans --disable-xim \
   --enable-gui=gtk2 --with-x -build
-RUN ln -s /vim-build/bin/vim-master /usr/bin/gvim
+RUN ln -s /vim-build/bin/vim /usr/bin/gvim
 RUN gvim --version
 
 # Install covimerage and vint.
 RUN gvim --version
 
 # Install covimerage and vint.
diff --git a/Makefile b/Makefile
index 49d9adefd10add223b02b48ad89b785f351d8124..2566d411dc911a7a4aea9153cd0581122ccd4f7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ test:
 
 # Run tests in dockerized Vims.
 DOCKER_REPO:=blueyed/vim-python-pep8-indent-vims-for-test
 
 # Run tests in dockerized Vims.
 DOCKER_REPO:=blueyed/vim-python-pep8-indent-vims-for-test
-DOCKER_TAG:=2
+DOCKER_TAG:=3
 DOCKER_IMAGE:=$(DOCKER_REPO):$(DOCKER_TAG)
 
 docker_image:
 DOCKER_IMAGE:=$(DOCKER_REPO):$(DOCKER_TAG)
 
 docker_image:
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.