From f1629784f6927a9c6dbfe8b02a8889af178afd39 Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Thu, 25 Sep 2025 21:14:31 -0700 Subject: [PATCH 1/3] Revert "Use macos-14 image for testing (rust-lang/backtrace-rs#733)" This reverts commit 60898d6377cdf7ccef58bf185379780f7c5af7fd. --- .github/workflows/main.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b70e41a..e1b4fc05 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,12 +22,10 @@ jobs: rust: beta - os: ubuntu-24.04 rust: nightly - - os: macos-14 + - os: macos-latest rust: stable - - os: macos-14 + - os: macos-latest rust: nightly - - os: macos-latest # macOS 15 - rust: stable - os: windows-latest rust: stable-x86_64-msvc - os: windows-latest @@ -81,11 +79,7 @@ jobs: CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed - run: cargo test --manifest-path crates/without_debuginfo/Cargo.toml - - if: matrix.os != 'macos-latest' - run: cargo test --manifest-path crates/line-tables-only/Cargo.toml - # FIXME: This currently fails on macOS 15. - - if: matrix.os == 'macos-latest' - run: '! cargo test --manifest-path crates/line-tables-only/Cargo.toml' + - run: cargo test --manifest-path crates/line-tables-only/Cargo.toml # Test debuginfo compression still works - run: cargo test @@ -101,18 +95,18 @@ jobs: # Test that, on macOS, packed/unpacked debuginfo both work - run: cargo clean && cargo test # Test that, on macOS, packed/unpacked debuginfo both work - if: contains(matrix.os, 'macos') + if: matrix.os == 'macos-latest' env: CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: unpacked CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: unpacked - run: cargo clean && cargo test - if: contains(matrix.os, 'macos') + if: matrix.os == 'macos-latest' env: CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed # Test that, on macOS, binaries with no UUID work - run: cargo clean && cargo test - if: contains(matrix.os, 'macos') + if: matrix.os == 'macos-latest' env: RUSTFLAGS: "-C link-arg=-Wl,-no_uuid" From 3dd14a8584bf9be212e6c4e925f7a78709f8a627 Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Thu, 25 Sep 2025 21:45:06 -0700 Subject: [PATCH 2/3] Fix line-tables-only test on macOS 15 --- crates/line-tables-only/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/line-tables-only/build.rs b/crates/line-tables-only/build.rs index 125fb764..e56fb361 100644 --- a/crates/line-tables-only/build.rs +++ b/crates/line-tables-only/build.rs @@ -3,7 +3,6 @@ fn main() { cc::Build::new() .opt_level(0) - .debug(false) .flag("-g1") .file("src/callback.c") .compile("libcallback.a"); From 1cea408bb02288d8611f7b83e8bc154cbaedd47e Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Fri, 26 Sep 2025 09:34:56 -0700 Subject: [PATCH 3/3] comment on why not using -gline-tables-only --- crates/line-tables-only/build.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/line-tables-only/build.rs b/crates/line-tables-only/build.rs index e56fb361..a8897213 100644 --- a/crates/line-tables-only/build.rs +++ b/crates/line-tables-only/build.rs @@ -3,6 +3,7 @@ fn main() { cc::Build::new() .opt_level(0) + // Don't use -gline-tables-only: it breaks on platforms that don't use clang (Linux with gcc, etc.) .flag("-g1") .file("src/callback.c") .compile("libcallback.a");