diff options
| author | ichizok <gclient.gaap@gmail.com> | 2022-10-06 16:56:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-06 16:56:44 +0100 |
| commit | d459020c62f945ca089a6f7349d559cc9db8596b (patch) | |
| tree | 8e55119194f556f38e1718692cec1475e304db48 | |
| parent | 851907a7ab2db84e1e93c3f7ef417cc46c5c19c7 (diff) | |
| download | vim-git-9.0.0676.tar.gz | |
patch 9.0.0676: CI on Mac M1 with gcc actually uses clangv9.0.0676
Problem: CI on Mac M1 with gcc actually uses clang.
Solution: Remove the gcc task. (Ozaki Kiichi, closes #11297)
| -rw-r--r-- | .cirrus.yml | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 17 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index f11c92cf8..4cb700c7b 100644 --- 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 3cf2ef9d6..5cf086ec9 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 */ /**/ + 676, +/**/ 675, /**/ 674, |