summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip H <47042125+pheiduck@users.noreply.github.com>2022-09-26 20:17:26 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-26 20:17:26 +0100
commit7381c0ce3f3e79ec5a74b9be8fc34e0c8181463b (patch)
tree8fe238eae04e9d694b1885ac0c43dc67ee9189e3
parent1190139ed01c27539615beea9559a88b2551daf3 (diff)
downloadvim-git-7381c0ce3f3e79ec5a74b9be8fc34e0c8181463b.tar.gz
patch 9.0.0596: CI on Mac M1 has the channel feature disabledv9.0.0596
Problem: CI on Mac M1 has the channel feature disabled. Solution: Include the channel feature.
-rw-r--r--.cirrus.yml2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 33863a30e..a1f055b80 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -37,7 +37,7 @@ macos_task:
- brew install gettext libtool
build_script:
- NPROC=$(getconf _NPROCESSORS_ONLN)
- - ./configure --with-features=${FEATURES} --disable-channel
+ - ./configure --with-features=${FEATURES}
- make -j${NPROC} CC=clang
test_script:
- src/vim --version
diff --git a/src/version.c b/src/version.c
index 35f37e9d9..3111b4f92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 596,
+/**/
595,
/**/
594,