diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-10-19 14:51:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 14:51:59 +0200 |
| commit | 4833a63929a83c11379036ead33913711134015b (patch) | |
| tree | 0277f45f49ffbfd8e5ec5f2c74cf8d3c389be5e2 | |
| parent | 54137a798f35177b517d30937a58f6d52a96bcf1 (diff) | |
| parent | f8632c51f10a8ae63e972e1063d5ee2c7fbda6e6 (diff) | |
| download | rneovim-4833a63929a83c11379036ead33913711134015b.tar.gz rneovim-4833a63929a83c11379036ead33913711134015b.tar.bz2 rneovim-4833a63929a83c11379036ead33913711134015b.zip | |
Merge pull request #30863 from neovim/ci-macos
ci: bump Intel macOS runners to 13
| -rw-r--r-- | .github/workflows/release.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6abdd588ba..de90a077ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,9 +81,9 @@ jobs: strategy: fail-fast: false matrix: - runner: [ macos-12, macos-14 ] + runner: [ macos-13, macos-14 ] include: - - runner: macos-12 + - runner: macos-13 arch: x86_64 - runner: macos-14 arch: arm64 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 522692b30a..0885efddd5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,8 +107,8 @@ jobs: { runner: ubuntu-24.04, os: ubuntu, flavor: asan, cc: clang, flags: -D ENABLE_ASAN_UBSAN=ON }, { 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-15, os: macos, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, + { runner: macos-13, os: macos, flavor: intel, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, + { runner: macos-15, os: macos, flavor: arm, 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] |