From: Philip H <47042125+pheiduck@users.noreply.github.com>
Date: Mon, 26 Sep 2022 19:17:26 +0000 (+0100)
Subject: patch 9.0.0596: CI on Mac M1 has the channel feature disabled
X-Git-Tag: v9.0.0596
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7381c0ce3f3e79ec5a74b9be8fc34e0c8181463b;p=thirdparty%2Fvim.git

patch 9.0.0596: CI on Mac M1 has the channel feature disabled

Problem:    CI on Mac M1 has the channel feature disabled.
Solution:   Include the channel feature.
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 33863a30ee..a1f055b800 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 35f37e9d90..3111b4f922 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    596,
 /**/
     595,
 /**/