summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-09 14:07:52 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-09 14:07:52 +0200
commit94f6c06ac54401ea34a07f8c45242f11bd1e1e3a (patch)
treecb439d8ed6bb462cc96b436d769ff29cec33fee2
parent62a232506d06f6d1b3b7271801c907d6294dfe84 (diff)
downloadvim-git-94f6c06ac54401ea34a07f8c45242f11bd1e1e3a.tar.gz
patch 8.2.1402: s390x tests always failv8.2.1402
Problem: s390x tests always fail. Solution: Temporarily disable s390x tests.
-rw-r--r--.travis.yml13
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index d199efb57..a4c628740 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -208,12 +208,13 @@ jobs:
env:
- *normal
- *shadowopt
- - <<: *linux
- arch: s390x
- name: huge/gcc-s390x
- compiler: gcc
- env: *linux-huge
- services: []
+ # Temporarily disabled, always fails
+ #- <<: *linux
+ # arch: s390x
+ # name: huge/gcc-s390x
+ # compiler: gcc
+ # env: *linux-huge
+ # services: []
- <<: *linux
arch: arm64
name: huge/gcc-arm64
diff --git a/src/version.c b/src/version.c
index 15f4c061d..697a47cf9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1402,
+/**/
1401,
/**/
1400,