Skip to content

Commit 2c814b3

Browse files
Revert "Use macos-14 image for testing (#733)"
This reverts commit 60898d6.
1 parent 16adfb3 commit 2c814b3

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ jobs:
2222
rust: beta
2323
- os: ubuntu-24.04
2424
rust: nightly
25-
- os: macos-14
25+
- os: macos-latest
2626
rust: stable
27-
- os: macos-14
27+
- os: macos-latest
2828
rust: nightly
29-
- os: macos-latest # macOS 15
30-
rust: stable
3129
- os: windows-latest
3230
rust: stable-x86_64-msvc
3331
- os: windows-latest
@@ -81,11 +79,7 @@ jobs:
8179
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
8280
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
8381
- run: cargo test --manifest-path crates/without_debuginfo/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'
82+
- run: cargo test --manifest-path crates/line-tables-only/Cargo.toml
8983

9084
# Test debuginfo compression still works
9185
- run: cargo test
@@ -101,18 +95,18 @@ jobs:
10195
# Test that, on macOS, packed/unpacked debuginfo both work
10296
- run: cargo clean && cargo test
10397
# Test that, on macOS, packed/unpacked debuginfo both work
104-
if: contains(matrix.os, 'macos')
98+
if: matrix.os == 'macos-latest'
10599
env:
106100
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: unpacked
107101
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: unpacked
108102
- run: cargo clean && cargo test
109-
if: contains(matrix.os, 'macos')
103+
if: matrix.os == 'macos-latest'
110104
env:
111105
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
112106
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
113107
# Test that, on macOS, binaries with no UUID work
114108
- run: cargo clean && cargo test
115-
if: contains(matrix.os, 'macos')
109+
if: matrix.os == 'macos-latest'
116110
env:
117111
RUSTFLAGS: "-C link-arg=-Wl,-no_uuid"
118112

0 commit comments

Comments
 (0)