Skip to content

Commit 3ff71cd

Browse files
pheiduckbrammool
authored andcommitted
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 #11263)
1 parent 346823d commit 3ff71cd

2 files changed

Lines changed: 19 additions & 2 deletions

File tree

.cirrus.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,27 @@ freebsd_task:
2727
- sudo -u cirrus make test
2828

2929
macos_task:
30-
name: macOS m1
30+
name: macOS (arm64 gcc)
31+
macos_instance:
32+
image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
33+
timeout_in: 20m
34+
install_script:
35+
- brew update
36+
- brew install gettext libtool
37+
build_script:
38+
- NPROC=$(getconf _NPROCESSORS_ONLN)
39+
- ./configure --with-features=${FEATURES}
40+
- make -j${NPROC}
41+
test_script:
42+
- src/vim --version
43+
- make test
44+
45+
macos_task:
46+
name: macOS (arm64 clang)
3147
macos_instance:
3248
image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
3349
timeout_in: 20m
3450
install_script:
35-
- uname -a
3651
- brew update
3752
- brew install gettext libtool
3853
build_script:

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,8 @@ static char *(features[]) =
699699

700700
static int included_patches[] =
701701
{ /* Add new patch number below this line */
702+
/**/
703+
668,
702704
/**/
703705
667,
704706
/**/

0 commit comments

Comments
 (0)