Mercurial > vim

changeset 30683:9549234f3f95 v9.0.0676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0676: CI on Mac M1 with gcc actually uses clang Commit: https://github.com/vim/vim/commit/d459020c62f945ca089a6f7349d559cc9db8596b Author: ichizok <gclient.gaap@gmail.com> Date: Thu Oct 6 16:56:44 2022 +0100 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 https://github.com/vim/vim/issues/11297)
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 Oct 2022 18:00:04 +0200
parents bd536cea4016
children fc971ca2a6b4
files .cirrus.yml src/version.c
diffstat 2 files changed, 6 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 */
 /**/
+    676,
+/**/
     675,
 /**/
     674,