diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 68792b409eb741..f149982c018255 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -12,7 +12,7 @@ const ubuntuX86XlRunner = "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04"; const ubuntuARMRunner = "ubicloud-standard-16-arm"; const windowsX86Runner = "windows-2022"; const windowsX86XlRunner = "windows-2022-xl"; -const macosX86Runner = "macos-13"; +const macosX86Runner = "macos-15-intel"; const macosArmRunner = "macos-14"; const selfHostedMacosArmRunner = "ghcr.io/cirruslabs/macos-runner:sonoma"; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fd91cdc0be92e..11087b5e24e58e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,12 +60,12 @@ jobs: include: - os: macos arch: x86_64 - runner: macos-13 + runner: macos-15-intel job: test profile: debug - os: macos arch: x86_64 - runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''macos-13'' }}' + runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''macos-15-intel'' }}' job: test profile: release skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}' @@ -762,7 +762,7 @@ jobs: job: lint - os: macos arch: x86_64 - runner: macos-13 + runner: macos-15-intel profile: debug job: lint - os: windows diff --git a/Cargo.lock b/Cargo.lock index e2b40f6098da77..9fb8088a74ef01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5794,9 +5794,8 @@ dependencies = [ [[package]] name = "libsui" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ff2746d6f3ea1421944f625fd827c52e0d7e97b91976d4c940c486da38b414" +version = "0.12.1" +source = "git+https://github.com/denoland/sui?branch=find_section_search_intel#2f664e013dff9dab3c2b02e8c297f86b2fb784f9" dependencies = [ "editpe", "image", diff --git a/Cargo.toml b/Cargo.toml index bb482a1a2fc551..ba7108bd6768f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -312,7 +312,8 @@ dprint-plugin-markdown = "=0.20.0" dprint-plugin-typescript = "=0.95.13" env_logger = "=0.11.6" fancy-regex = "=0.14.0" -libsui = "0.11.0" +# libsui = "0.12.1" +libsui = { git = "https://github.com/denoland/sui", branch = "find_section_search_intel" } malva = "=0.12.1" markup_fmt = "=0.22.0" open = "5.0.1" diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs index c3b463a9bb80bc..50a3ca4afd1baf 100644 --- a/cli/standalone/binary.rs +++ b/cli/standalone/binary.rs @@ -180,10 +180,10 @@ pub fn is_standalone_binary(exe_path: &Path) -> bool { let Ok(data) = std::fs::read(exe_path) else { return false; }; - libsui::utils::is_elf(&data) || libsui::utils::is_pe(&data) || libsui::utils::is_macho(&data) + || data.is_empty() } pub struct WriteBinOptions<'a> {