Skip to content

Upgrade nightly macOS version to macos 15 #20159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2025
Merged

Upgrade nightly macOS version to macos 15 #20159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ on:
libmysqlclient_with_mysqli:
required: true
type: boolean
macos_arm64_version:
required: true
type: string
run_alpine:
required: true
type: boolean
Expand Down Expand Up @@ -366,11 +369,11 @@ jobs:
matrix:
debug: [true, false]
zts: [true, false]
os: ['13', '14']
arch: ['X64', 'ARM64']
exclude:
- os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: macos-${{ matrix.os }}
- arch: ${{ !inputs.run_macos_arm64 && 'ARM64' || '*never*' }}
name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || inputs.macos_arm64_version }}
steps:
- name: git checkout
uses: actions/checkout@v5
Expand All @@ -393,7 +396,7 @@ jobs:
- name: Test
uses: ./.github/actions/test-macos
- name: Test Tracing JIT
if: matrix.os != '14' || !matrix.zts
if: matrix.arch == 'X64' || !matrix.zts
uses: ./.github/actions/test-macos
with:
jitType: tracing
Expand All @@ -405,7 +408,7 @@ jobs:
runTestsParameters: >-
-d opcache.enable_cli=1
- name: Test Function JIT
if: matrix.os != '14' || !matrix.zts
if: matrix.arch == 'X64' || !matrix.zts
uses: ./.github/actions/test-macos
with:
jitType: function
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/root.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
branch: ${{ matrix.branch.ref }}
community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
macos_arm64_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '15' || '14' }}
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_linux_ppc64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
Expand Down