aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordundargoc <gocdundar@gmail.com>2024-10-05 19:03:11 +0200
committerdundargoc <33953936+dundargoc@users.noreply.github.com>2024-10-06 16:06:28 +0200
commit00d1078ede9e0f03dd5eecbc9599d39c913ab953 (patch)
treea970b714c9cedaaf4cc7cebf0653f93ce0ed0422
parent9788b81d7e53e7ad1ca9db249d86e43426ce56c2 (diff)
downloadrneovim-00d1078ede9e0f03dd5eecbc9599d39c913ab953.tar.gz
rneovim-00d1078ede9e0f03dd5eecbc9599d39c913ab953.tar.bz2
rneovim-00d1078ede9e0f03dd5eecbc9599d39c913ab953.zip
ci: bump macos runner version to macos-15
-rw-r--r--.github/workflows/test.yml2
-rw-r--r--MAINTAIN.md12
-rw-r--r--runtime/doc/support.txt2
-rw-r--r--test/functional/lua/watch_spec.lua2
4 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ce2c0540b1..522692b30a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -108,7 +108,7 @@ jobs:
{ runner: ubuntu-24.04, os: ubuntu, flavor: tsan, cc: clang, flags: -D ENABLE_TSAN=ON },
{ runner: ubuntu-24.04, os: ubuntu, cc: gcc },
{ runner: macos-12, os: macos, flavor: 12, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER },
- { runner: macos-14, os: macos, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER },
+ { runner: macos-15, os: macos, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER },
{ runner: ubuntu-24.04, os: ubuntu, flavor: puc-lua, cc: gcc, deps_flags: -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON, flags: -D PREFER_LUA=ON },
]
test: [unittest, functionaltest, oldtest]
diff --git a/MAINTAIN.md b/MAINTAIN.md
index f7dd8a1ef7..5d046926c2 100644
--- a/MAINTAIN.md
+++ b/MAINTAIN.md
@@ -213,12 +213,12 @@ https://github.com/neovim/neovim-backup
* For special-purpose jobs where the runner version doesn't really matter,
prefer `-latest` tags so we don't need to manually bump the versions. An
example of a special-purpose workflow is `labeler_pr.yml`.
- * For our testing job `test.yml`, prefer to use the latest stable (i.e.
- non-beta) version explicitly. Avoid using the `-latest` tags here as it
- makes it difficult to determine from an unrelated PR if a failure is due
- to the PR itself or due to GitHub bumping the `-latest` tag without our
- knowledge. There's also a high risk that automatically bumping the CI
- versions will fail due to manual work being required from experience.
+ * For our testing job `test.yml`, prefer to use the latest version
+ explicitly. Avoid using the `-latest` tags here as it makes it difficult
+ to determine from an unrelated PR if a failure is due to the PR itself or
+ due to GitHub bumping the `-latest` tag without our knowledge. There's
+ also a high risk that automatically bumping the CI versions will fail due
+ to manual work being required from experience.
* For our release job, which is `release.yml`, prefer to use the oldest
stable (i.e. non-deprecated) versions available. The reason is that we're
trying to produce images that work in the broadest number of environments,
diff --git a/runtime/doc/support.txt b/runtime/doc/support.txt
index 36332a2a65..0ddf037fba 100644
--- a/runtime/doc/support.txt
+++ b/runtime/doc/support.txt
@@ -14,7 +14,7 @@ Supported platforms *supported-platforms*
`System` `Tier` `Versions` `Tested versions`
Linux 1 >= 2.6.32, glibc >= 2.12 Ubuntu 24.04
macOS (Intel) 1 >= 11 macOS 12
-macOS (M1) 1 >= 11 macOS 14
+macOS (M1) 1 >= 11 macOS 15
Windows 64-bit 1 >= Windows 10 Version 1809 Windows Server 2022
FreeBSD 1 >= 10 FreeBSD 13
OpenBSD 2 >= 7
diff --git a/test/functional/lua/watch_spec.lua b/test/functional/lua/watch_spec.lua
index 0c575900d3..ad16df8a7c 100644
--- a/test/functional/lua/watch_spec.lua
+++ b/test/functional/lua/watch_spec.lua
@@ -92,7 +92,7 @@ describe('vim._watch', function()
skip(is_os('bsd'), 'Stopped working on bsd after 3ca967387c49c754561c3b11a574797504d40f38')
elseif watchfunc == 'watchdirs' and is_os('mac') then
-- Bump this (or fix the bug) if CI continues to fail in future versions of macos CI.
- skip(is_ci() and vim.uv.os_uname().release == '23.6.0', 'weird failure for macOS arm 14 CI')
+ skip(is_ci() and vim.uv.os_uname().release == '24.0.0', 'weird failure for macOS arm 15 CI')
else
skip(
is_os('bsd'),