diff options
author | Philip H <47042125+pheiduck@users.noreply.github.com> | 2022-10-05 20:41:01 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-10-05 20:41:01 +0100 |
commit | 3ff71cda986b809e8ffeebee6804b50b3607df63 (patch) | |
tree | 5b91364c5e4c7005d83b9932aa50a1bde1a52e92 | |
parent | 346823d3e5668b99d2c2fd920e7f215e21ad3ea7 (diff) | |
download | vim-git-3ff71cda986b809e8ffeebee6804b50b3607df63.tar.gz |
patch 9.0.0668: CI on Mac M1 only uses clangv9.0.0668
Problem: CI on Mac M1 only uses clang
Solution: Also run with gcc. (closes #11263)
-rw-r--r-- | .cirrus.yml | 19 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index a1f055b80..f11c92cf8 100644 --- 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 0d3e911e0..b7bb5697b 100644 --- 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, |