diff options
-rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
-rw-r--r-- | src/testdir/test_diffmode.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_sound.vim | 7 | ||||
-rw-r--r-- | src/testdir/test_terminal2.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 27 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebac88216b..69fb7a41de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -299,7 +299,7 @@ jobs: done macos: - runs-on: macos-latest + runs-on: ${{ matrix.runner }} env: CC: clang @@ -312,17 +312,24 @@ jobs: fail-fast: false matrix: features: [tiny, normal, huge] + runner: [macos-latest, macos-14] steps: - name: Checkout repository from github uses: actions/checkout@v4 - - name: Install packages - if: matrix.features == 'huge' + - name: Install packages on Intel Mac + if: matrix.features == 'huge' && matrix.runner == 'macos-latest' run: | brew install lua echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV + - name: Install packages on M1 Mac + if: matrix.features == 'huge' && matrix.runner == 'macos-14' + run: | + brew install lua libtool + echo "LUA_PREFIX=/opt/homebrew" >> $GITHUB_ENV + - name: Set up environment run: | ( diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 930fd7b837..64a8818d67 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -871,6 +871,10 @@ func VerifyInternal(buf, dumpfile, extra) endfunc func Test_diff_screen() + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: This test fails on M1 Mac on GitHub Actions' + endif + let g:test_is_flaky = 1 CheckScreendump CheckFeature menu diff --git a/src/testdir/test_sound.vim b/src/testdir/test_sound.vim index e97ac6198b..020d458912 100644 --- a/src/testdir/test_sound.vim +++ b/src/testdir/test_sound.vim @@ -15,6 +15,9 @@ func Test_play_event() if has('win32') throw 'Skipped: Playing event with callback is not supported on Windows' endif + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: Running this test on M1 Mac hangs on GitHub Actions' + endif let g:playcallback_count = 0 let g:id = 0 let event_name = 'bell' @@ -35,6 +38,10 @@ func Test_play_event() endfunc func Test_play_silent() + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: Running this test on M1 Mac hangs on GitHub Actions' + endif + let fname = fnamemodify('silent.wav', '%p') let g:playcallback_count = 0 diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim index 9798c51940..c7d1a9a7bd 100644 --- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -536,6 +536,10 @@ endfunc " Test for term_gettitle() func Test_term_gettitle() + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: Title got on M1 Mac is broken on GitHub Actions' + endif + " term_gettitle() returns an empty string for a non-terminal buffer " and for a non-existing buffer. call assert_equal('', bufnr('%')->term_gettitle()) diff --git a/src/version.c b/src/version.c index b70c90a26b..75038dd6e0 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 70, +/**/ 69, /**/ 68, |