diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2746605d2b..677630baa2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -319,17 +319,17 @@ jobs: - name: Checkout repository from github uses: actions/checkout@v4 - - 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' + - name: Install packages + if: matrix.features == 'huge' run: | brew install lua libtool - echo "LUA_PREFIX=/opt/homebrew" >> $GITHUB_ENV + echo "LUA_PREFIX=$(brew --prefix)" >> $GITHUB_ENV + + - name: Grant microphone access for macos-14 + if: matrix.runner == 'macos-14' + run: | + # Temporary fix to fix microphone permission issues for macos-14 when playing sound. + sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);" - name: Set up environment run: | diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index bae94f6a87..b44879f71e 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -871,8 +871,8 @@ 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' + if has('osxdarwin') && system('diff --version') =~ '^Apple diff' + throw 'Skipped: unified diff does not work properly on this macOS version' endif let g:test_is_flaky = 1 diff --git a/src/testdir/test_sound.vim b/src/testdir/test_sound.vim index 020d458912..e97ac6198b 100644 --- a/src/testdir/test_sound.vim +++ b/src/testdir/test_sound.vim @@ -15,9 +15,6 @@ 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' @@ -38,10 +35,6 @@ 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 c7d1a9a7bd..9798c51940 100644 --- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -536,10 +536,6 @@ 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 c79fd6b1b7..96f1a556af 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 107, /**/ 106, /**/