summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-28 20:53:08 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-28 20:53:08 +0100
commit31ff2e1b43f5c85fdabfcfce93192405e6e559e2 (patch)
tree425d51fbad72c007bc157adc3d9928c87a0154fa
parent5708079a6b144e68bf85503bc3a7779d3a7cc2a6 (diff)
downloadvim-git-31ff2e1b43f5c85fdabfcfce93192405e6e559e2.tar.gz
patch 8.1.2354: Cirrus CI runs on another repositoryv8.1.2354
Problem: Cirrus CI runs on another repository. Solution: Run Cirrus CI on vim/vim.
-rw-r--r--.cirrus.yml13
-rw-r--r--README.md4
-rw-r--r--src/version.c2
3 files changed, 14 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 0e4a3d64a..2aae80e39 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,9 +1,16 @@
+env:
+ #CIRRUS_CLONE_DEPTH: 1
+ FEATURES: huge
+
freebsd_12_task:
freebsd_instance:
image: freebsd-12-1-release-amd64
install_script:
- pkg install -y gettext gmake
+ pkg install -y gettext
build_script:
- - gmake
+ - NPROC=$(getconf _NPROCESSORS_ONLN)
+ - ./configure --with-features=${FEATURES}
+ - make -j${NPROC}
+ - src/vim --version
test_script:
- - gmake test
+ - make test
diff --git a/README.md b/README.md
index 949b0a6b0..c14c31869 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
![Vim Logo](https://github.com/vim/vim/blob/master/runtime/vimlogo.gif)
-[![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
+[![Travis Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
-[![Build Status](https://api.cirrus-ci.com/github/chrisbra/vim.svg)](https://cirrus-ci.com/github/chrisbra/vim)
+[![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim)
[![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
[![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp)
diff --git a/src/version.c b/src/version.c
index 0e2f7faf2..b3b48d486 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2354,
+/**/
2353,
/**/
2352,