From 5a51219a6664f0edd4e195aaa9cd3d1fc5025cdf Mon Sep 17 00:00:00 2001 From: Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com> Date: Thu, 11 Dec 2025 15:05:09 -0800 Subject: [PATCH] fix(compile): intel mac compile fix (#31575) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- tests/specs/compile/determinism/__test__.jsonc | 1 - tests/specs/compile/ffi/__test__.jsonc | 1 - .../global_npm_cache_implicit_read_permission/__test__.jsonc | 4 ++-- tests/specs/compile/include/buffered_reads/__test__.jsonc | 4 ++-- tests/specs/compile/node_api/__test__.jsonc | 1 - tests/specs/compile/npm_fs/__test__.jsonc | 4 ++-- tests/specs/compile/package_json_type/__test__.jsonc | 4 ++-- tests/specs/npm/file_specifier/__test__.jsonc | 2 -- 10 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dad45fe040..971f588326 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5786,9 +5786,9 @@ dependencies = [ [[package]] name = "libsui" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99dc19fe502fbaca89d5607b14a0e301a40af42a14e33afc349e73eaef2bc86f" +checksum = "6c238ae4b3e1467d748ad42f1ffa68618ee40b901bcee0296b0ecea07306b1f5" dependencies = [ "editpe", "image", diff --git a/Cargo.toml b/Cargo.toml index 839feaf0b4..5b3c67ce54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -314,7 +314,7 @@ dprint-plugin-markdown = "=0.20.0" dprint-plugin-typescript = "=0.95.13" env_logger = "=0.11.6" fancy-regex = "=0.14.0" -libsui = "0.12.2" +libsui = "0.12.3" malva = "=0.12.1" markup_fmt = "=0.22.0" open = "5.0.1" diff --git a/tests/specs/compile/determinism/__test__.jsonc b/tests/specs/compile/determinism/__test__.jsonc index 7f7e8285a4..b8bbfcf6e2 100644 --- a/tests/specs/compile/determinism/__test__.jsonc +++ b/tests/specs/compile/determinism/__test__.jsonc @@ -1,6 +1,5 @@ { "tempDir": true, - "if": "notMacIntel", "steps": [{ "args": [ "eval", diff --git a/tests/specs/compile/ffi/__test__.jsonc b/tests/specs/compile/ffi/__test__.jsonc index 97980ce6e7..ad8b13ecf3 100644 --- a/tests/specs/compile/ffi/__test__.jsonc +++ b/tests/specs/compile/ffi/__test__.jsonc @@ -1,6 +1,5 @@ { "tempDir": true, - "if": "notMacIntel", "steps": [{ "args": "run -A setup.ts", "output": "[WILDCARD]" diff --git a/tests/specs/compile/global_npm_cache_implicit_read_permission/__test__.jsonc b/tests/specs/compile/global_npm_cache_implicit_read_permission/__test__.jsonc index 5ff38bf875..d346c3ad20 100644 --- a/tests/specs/compile/global_npm_cache_implicit_read_permission/__test__.jsonc +++ b/tests/specs/compile/global_npm_cache_implicit_read_permission/__test__.jsonc @@ -1,11 +1,11 @@ { "tempDir": true, "steps": [{ - "if": "notMacIntel", + "if": "unix", "args": "compile --output main main.ts", "output": "compile.out" }, { - "if": "notMacIntel", + "if": "unix", "commandName": "./main", "args": [], "output": "main.out" diff --git a/tests/specs/compile/include/buffered_reads/__test__.jsonc b/tests/specs/compile/include/buffered_reads/__test__.jsonc index 3b8b7e4264..7640fed56b 100644 --- a/tests/specs/compile/include/buffered_reads/__test__.jsonc +++ b/tests/specs/compile/include/buffered_reads/__test__.jsonc @@ -4,11 +4,11 @@ "args": "run -A setup.js", "output": "[WILDCARD]" }, { - "if": "notMacIntel", + "if": "unix", "args": "compile --allow-read=data --include data --output main main.ts", "output": "[WILDCARD]" }, { - "if": "notMacIntel", + "if": "unix", "commandName": "./main", "args": [], "output": "[WILDCARD]", diff --git a/tests/specs/compile/node_api/__test__.jsonc b/tests/specs/compile/node_api/__test__.jsonc index 4540d3ef9f..519ce01a93 100644 --- a/tests/specs/compile/node_api/__test__.jsonc +++ b/tests/specs/compile/node_api/__test__.jsonc @@ -1,6 +1,5 @@ { "tempDir": true, - "if": "notMacIntel", "steps": [{ "args": "install --allow-scripts", "output": "[WILDCARD]" diff --git a/tests/specs/compile/npm_fs/__test__.jsonc b/tests/specs/compile/npm_fs/__test__.jsonc index 4919e4fd2e..a8198bfb5d 100644 --- a/tests/specs/compile/npm_fs/__test__.jsonc +++ b/tests/specs/compile/npm_fs/__test__.jsonc @@ -3,11 +3,11 @@ // use this so the vfs output is all in the same folder "canonicalizedTempDir": true, "steps": [{ - "if": "notMacIntel", + "if": "unix", "args": "compile -A --output main main.ts", "output": "compile.out" }, { - "if": "notMacIntel", + "if": "unix", "commandName": "./main", "args": [], "output": "main.out" diff --git a/tests/specs/compile/package_json_type/__test__.jsonc b/tests/specs/compile/package_json_type/__test__.jsonc index 266e25b866..0abf121f05 100644 --- a/tests/specs/compile/package_json_type/__test__.jsonc +++ b/tests/specs/compile/package_json_type/__test__.jsonc @@ -4,11 +4,11 @@ "args": "install", "output": "[WILDCARD]" }, { - "if": "notMacIntel", + "if": "unix", "args": "compile --output main main.js", "output": "compile.out" }, { - "if": "notMacIntel", + "if": "unix", "commandName": "./main", "args": [], "output": "output.out", diff --git a/tests/specs/npm/file_specifier/__test__.jsonc b/tests/specs/npm/file_specifier/__test__.jsonc index 429b361400..d930d8085c 100644 --- a/tests/specs/npm/file_specifier/__test__.jsonc +++ b/tests/specs/npm/file_specifier/__test__.jsonc @@ -23,11 +23,9 @@ "exitCode": 1, "output": "node_modules_dir.out" }, { - "if": "notMacIntel", "args": "compile --allow-read --output exec package-a/index.mjs", "output": "compile.out" }, { - "if": "notMacIntel", "commandName": "./exec", "args": [], "output": "output.out"