patch 9.0.0668: CI on Mac M1 only uses clang

Problem:    CI on Mac M1 only uses clang
Solution:   Also run with gcc. (closes #11263)

diff --git a/.cirrus.yml b/.cirrus.yml
index a1f055b800e6dc3fb6abc471f4038f19752278dc..f11c92cf82e057e1d7b84215148147b279d061f0 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,12 +27,27 @@ freebsd_task:
     - sudo -u cirrus make test
 
 macos_task:
-  name: macOS m1
+  name: macOS (arm64 gcc)
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
+  timeout_in: 20m
+  install_script:
+    - brew update
+    - brew install gettext libtool
+  build_script:
+    - NPROC=$(getconf _NPROCESSORS_ONLN)
+    - ./configure --with-features=${FEATURES}
+    - make -j${NPROC}
+  test_script:
+    - src/vim --version
+    - make test
+
+macos_task:
+  name: macOS (arm64 clang)
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
   timeout_in: 20m
   install_script:
-    - uname -a
     - brew update
     - brew install gettext libtool
   build_script:

diff --git a/src/version.c b/src/version.c
index 0d3e911e023fce82f97b746f3748b0424e09adde..b7bb5697bbdde5e643bb7b64e7a2c4adac461c4e 100644 (file)
--- 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 */
+/**/
+    668,
 /**/
     667,
 /**/