patch 9.0.0676: CI on Mac M1 with gcc actually uses clang

Problem:    CI on Mac M1 with gcc actually uses clang.
Solution:   Remove the gcc task. (Ozaki Kiichi, closes #11297)

diff --git a/.cirrus.yml b/.cirrus.yml
index f11c92cf82e057e1d7b84215148147b279d061f0..4cb700c7b6456eb81e66d6acb0de0793f5abe8e0 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,9 +27,12 @@ freebsd_task:
     - sudo -u cirrus make test
 
 macos_task:
-  name: macOS (arm64 gcc)
+  name: macOS m1
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
+  env:
+    # only run with clang, gcc is not real, it is a link to clang
+    CC: clang
   timeout_in: 20m
   install_script:
     - brew update
@@ -41,19 +44,3 @@ macos_task:
   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:
-    - brew update
-    - brew install gettext libtool
-  build_script:
-    - NPROC=$(getconf _NPROCESSORS_ONLN)
-    - ./configure --with-features=${FEATURES}
-    - make -j${NPROC} CC=clang
-  test_script:
-    - src/vim --version
-    - make CC=clang test

diff --git a/src/version.c b/src/version.c
index 3cf2ef9d610a1f7087b8fc5274131de3156bdfbd..5cf086ec9b3bf878f5f900b0344ad587c91790cf 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 */
+/**/
+    676,
 /**/
     675,
 /**/