Skip to content

[8.0] upgrade to macos15 (#6932)#7984

Merged
nafraf merged 2 commits into8.0from
nafraf_backport-6932-to-8.0
Jan 9, 2026
Merged

[8.0] upgrade to macos15 (#6932)#7984
nafraf merged 2 commits into8.0from
nafraf_backport-6932-to-8.0

Conversation

@nafraf
Copy link
Collaborator

@nafraf nafraf commented Jan 7, 2026

Backport #6932 to 8.0
(cherry picked from commit c11c1e5)
Test: https://github.com/RediSearch/RediSearch/actions/runs/20772712199

To pass the merge queue test, this PR also includes:
Manual backport #7651 to 8.0
Test: https://github.com/RediSearch/RediSearch/actions/runs/20760950976


Note

Modernizes CI workflows and platform matrices.

  • Move macOS jobs to macos-15-intel (x86_64) and macos-latest (arm), replacing older runner labels in flow-macos.yml and macOS branches of flow-build-artifacts.yml
  • Bump Alpine from alpine:3 to alpine:3.22 across workflows, updating matrices, pre-step conditions, pre-deps, and node20 support/checkout cases in task-test.yml and task-build-artifacts.yml
  • Update Linux platform lists in task-get-linux-configurations.yml to include alpine:3.22 and adjust pre-dependency handling
  • Add a CPU information print step to task-test.yml for better diagnostics

Written by Cursor Bugbot for commit 35118ac. This will update automatically on new commits. Configure here.

(cherry picked from commit c11c1e5)
@nafraf nafraf requested a review from oshadmi January 7, 2026 06:44
@codecov
Copy link

codecov bot commented Jan 7, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.20%. Comparing base (1d946d7) to head (35118ac).
⚠️ Report is 1 commits behind head on 8.0.

Additional details and impacted files
@@            Coverage Diff             @@
##              8.0    #7984      +/-   ##
==========================================
- Coverage   89.34%   89.20%   -0.14%     
==========================================
  Files         200      200              
  Lines       37207    36282     -925     
==========================================
- Hits        33243    32367     -876     
+ Misses       3964     3915      -49     
Flag Coverage Δ
flow 83.90% <ø> (-0.20%) ⬇️
unit 42.26% <ø> (-0.28%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@nafraf nafraf requested a review from meiravgri January 7, 2026 14:54
meiravgri
meiravgri previously approved these changes Jan 7, 2026
@nafraf nafraf added this pull request to the merge queue Jan 7, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2026
echo "Core count: $(sysctl -n machdep.cpu.core_count 2>/dev/null || echo "N/A")"
echo "Thread count: $(sysctl -n machdep.cpu.thread_count 2>/dev/null || echo "N/A")"
echo "CPU vendor: $(sysctl -n machdep.cpu.vendor 2>/dev/null || echo "N/A")"
echo "CPU features: $(sysctl -n machdep.cpu.features 2>/dev/null || echo "N/A")"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CPU diagnostic uses Intel-only sysctl keys on ARM Macs

Low Severity

The new CPU information step uses machdep.cpu.* sysctl keys (brand_string, core_count, thread_count, vendor, features) which are Intel-specific and don't exist on Apple Silicon Macs. Since this PR specifically migrates to macos-latest which is now an ARM runner, all these sysctl commands will fail and output "N/A" on the ARM runners. The diagnostic step won't provide useful CPU information for the new ARM macOS environments. The workflow won't fail due to the || echo "N/A" fallback, but the diagnostic purpose is defeated. For ARM Macs, alternatives like sysctl hw.ncpu, sysctl hw.physicalcpu, or system_profiler SPHardwareDataType would be needed.

Fix in Cursor Fix in Web

@nafraf nafraf added this pull request to the merge queue Jan 9, 2026
Merged via the queue into 8.0 with commit 96875f1 Jan 9, 2026
12 checks passed
@nafraf nafraf deleted the nafraf_backport-6932-to-8.0 branch January 9, 2026 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants