# HG changeset patch # User Bram Moolenaar # Date 1664999102 -7200 # Node ID 6f76a14e0140929e2e76071190bda7ebe5df0ed3 # Parent 5ba5a53cefbe0abe328f2687173141e701109f1c patch 9.0.0668: CI on Mac M1 only uses clang Commit: https://github.com/vim/vim/commit/3ff71cda986b809e8ffeebee6804b50b3607df63 Author: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Wed Oct 5 20:41:01 2022 +0100 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 https://github.com/vim/vim/issues/11263) diff --git a/.cirrus.yml b/.cirrus.yml --- 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: - - uname -a + - 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: - brew update - brew install gettext libtool build_script: 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 */ /**/ + 668, +/**/ 667, /**/ 666,