forked from aniani/vim
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 #11297)
This commit is contained in:
parent
851907a7ab
commit
d459020c62
21
.cirrus.yml
21
.cirrus.yml
@ -27,9 +27,12 @@ freebsd_task:
|
|||||||
- sudo -u cirrus make test
|
- sudo -u cirrus make test
|
||||||
|
|
||||||
macos_task:
|
macos_task:
|
||||||
name: macOS (arm64 gcc)
|
name: macOS m1
|
||||||
macos_instance:
|
macos_instance:
|
||||||
image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
|
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
|
timeout_in: 20m
|
||||||
install_script:
|
install_script:
|
||||||
- brew update
|
- brew update
|
||||||
@ -41,19 +44,3 @@ macos_task:
|
|||||||
test_script:
|
test_script:
|
||||||
- src/vim --version
|
- src/vim --version
|
||||||
- make test
|
- 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
|
|
||||||
|
@ -699,6 +699,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
676,
|
||||||
/**/
|
/**/
|
||||||
675,
|
675,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user