Skip to content

Commit 60898d6

Browse files
authored
Use macos-14 image for testing (#733)
1 parent 0f130c5 commit 60898d6

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ jobs:
2222
rust: beta
2323
- os: ubuntu-24.04
2424
rust: nightly
25-
- os: macos-latest
25+
- os: macos-14
2626
rust: stable
27-
- os: macos-latest
27+
- os: macos-14
2828
rust: nightly
29+
- os: macos-latest # macOS 15
30+
rust: stable
2931
- os: windows-latest
3032
rust: stable-x86_64-msvc
3133
- os: windows-latest
@@ -79,7 +81,11 @@ jobs:
7981
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
8082
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
8183
- run: cargo test --manifest-path crates/without_debuginfo/Cargo.toml
82-
- run: cargo test --manifest-path crates/line-tables-only/Cargo.toml
84+
- if: matrix.os != 'macos-latest'
85+
run: cargo test --manifest-path crates/line-tables-only/Cargo.toml
86+
# FIXME: This currently fails on macOS 15.
87+
- if: matrix.os == 'macos-latest'
88+
run: '! cargo test --manifest-path crates/line-tables-only/Cargo.toml'
8389

8490
# Test debuginfo compression still works
8591
- run: cargo test
@@ -95,18 +101,18 @@ jobs:
95101
# Test that, on macOS, packed/unpacked debuginfo both work
96102
- run: cargo clean && cargo test
97103
# Test that, on macOS, packed/unpacked debuginfo both work
98-
if: matrix.os == 'macos-latest'
104+
if: contains(matrix.os, 'macos')
99105
env:
100106
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: unpacked
101107
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: unpacked
102108
- run: cargo clean && cargo test
103-
if: matrix.os == 'macos-latest'
109+
if: contains(matrix.os, 'macos')
104110
env:
105111
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
106112
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
107113
# Test that, on macOS, binaries with no UUID work
108114
- run: cargo clean && cargo test
109-
if: matrix.os == 'macos-latest'
115+
if: contains(matrix.os, 'macos')
110116
env:
111117
RUSTFLAGS: "-C link-arg=-Wl,-no_uuid"
112118

0 commit comments

Comments
 (0)