# HG changeset patch # User Bram Moolenaar # Date 1665072004 -7200 # Node ID 9549234f3f952125eaafb881f3365b329a1cfeca # Parent bd536cea4016005a300408938744ca1a2c1db594 patch 9.0.0676: CI on Mac M1 with gcc actually uses clang Commit: https://github.com/vim/vim/commit/d459020c62f945ca089a6f7349d559cc9db8596b Author: ichizok 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) diff --git a/.cirrus.yml b/.cirrus.yml --- 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 --- 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,