Skip to content

Commit 929c5a8

Browse files
authored
Merge pull request #9573 from ruby/macos-26-default-with-regression
Default macOS CI to `macos-26`
2 parents b3a02f3 + 88830b9 commit 929c5a8

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

.github/workflows/bundler.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ jobs:
3535
- { name: ruby-4.0, value: 4.0.5 }
3636

3737
include:
38-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.2, value: 3.2.11 }, timeout: 90 }
39-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.3, value: 3.3.11 }, timeout: 90 }
40-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.4, value: 3.4.9 }, timeout: 90 }
41-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-4.0, value: 4.0.5 }, timeout: 90 }
38+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-3.2, value: 3.2.11 }, timeout: 90 }
39+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-3.3, value: 3.3.11 }, timeout: 90 }
40+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-3.4, value: 3.4.9 }, timeout: 90 }
41+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-4.0, value: 4.0.5 }, timeout: 90 }
42+
43+
# Regression coverage for the Intel architecture with the latest Ruby only
44+
- { os: { name: macOS-intel, value: macos-15-intel }, ruby: { name: ruby-4.0, value: 4.0.5 }, timeout: 90 }
4245

4346
# Ruby 3.2 is about 20 minutes slower than 3.3/3.4, so it will be excluded from testing.
4447
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.3, value: 3.3.11 }, timeout: 150, group: a }
@@ -55,7 +58,7 @@ jobs:
5558
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-4.0, value: 4.0.5 }, timeout: 150, group: d }
5659

5760
- { os: { name: Ubuntu, value: ubuntu-24.04 }, ruby: { name: jruby, value: jruby-10.1.0.0 } }
58-
- { os: { name: macOS, value: macos-15 }, ruby: { name: jruby, value: jruby-10.1.0.0 } }
61+
- { os: { name: macOS, value: macos-26 }, ruby: { name: jruby, value: jruby-10.1.0.0 } }
5962
- { os: { name: Windows, value: windows-2025 }, ruby: { name: jruby, value: jruby-10.1.0.0 } }
6063

6164
- { os: { name: Ubuntu, value: ubuntu-24.04 }, ruby: { name: truffleruby, value: truffleruby-34.0.1 }, timeout: 20 }

.github/workflows/realworld-bundler.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
- { name: ruby-4.0, value: 4.0.5 }
3232

3333
include:
34-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.2, value: 3.2.11 } }
35-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.3, value: 3.3.11 } }
36-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.4, value: 3.4.9 } }
37-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-4.0, value: 4.0.5 } }
34+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-3.2, value: 3.2.11 } }
35+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-3.3, value: 3.3.11 } }
36+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-3.4, value: 3.4.9 } }
37+
- { os: { name: macOS, value: macos-26 }, ruby: { name: ruby-4.0, value: 4.0.5 } }
3838
env:
3939
RGV: .
4040
RUBYOPT: --disable-gems

.github/workflows/rubygems.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
os:
2929
- { name: Ubuntu, value: ubuntu-24.04 }
30-
- { name: macOS, value: macos-15 }
30+
- { name: macOS, value: macos-26 }
3131
- { name: Windows, value: windows-2025 }
3232

3333
ruby:
@@ -37,11 +37,15 @@ jobs:
3737
- { name: "4.0", value: 4.0.5 }
3838

3939
include:
40+
# Regression coverage for the Intel architecture with the latest Ruby only
41+
- ruby: { name: "4.0", value: 4.0.5 }
42+
os: { name: macOS-intel, value: macos-15-intel }
43+
4044
- ruby: { name: jruby, value: jruby-10.1.0.0 }
4145
os: { name: Ubuntu, value: ubuntu-24.04 }
4246

4347
- ruby: { name: jruby, value: jruby-10.1.0.0 }
44-
os: { name: macOS, value: macos-15 }
48+
os: { name: macOS, value: macos-26 }
4549

4650
- ruby: { name: jruby, value: jruby-10.1.0.0 }
4751
os: { name: Windows, value: windows-2025 }

0 commit comments

Comments
 (0)