Merge pull request #36893 from zeertzjq/backport

ci: stop using macos-13 runner (#35996)
This commit is contained in:
zeertzjq
2025-12-10 09:59:18 +08:00
committed by GitHub
parent 7e99466a89
commit bcc6e13851
2 changed files with 3 additions and 3 deletions

View File

@@ -91,9 +91,9 @@ jobs:
strategy:
fail-fast: false
matrix:
runner: [ macos-13, macos-14 ]
runner: [ macos-15-intel, macos-14 ]
include:
- runner: macos-13
- runner: macos-15-intel
arch: x86_64
- runner: macos-14
arch: arm64

View File

@@ -112,7 +112,7 @@ jobs:
{ runner: ubuntu-24.04, os: ubuntu, flavor: tsan, cc: clang, flags: -D ENABLE_TSAN=ON },
{ runner: ubuntu-24.04, os: ubuntu, flavor: release, cc: gcc, flags: -D CMAKE_BUILD_TYPE=Release -D ENABLE_TRANSLATIONS=ON },
# { runner: ubuntu-24.04-arm, os: ubuntu, flavor: arm, cc: gcc, flags: -D CMAKE_BUILD_TYPE=RelWithDebInfo },
{ 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-intel, 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 },
]