diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2022-03-21 09:30:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 14:30:43 +0100 |
| commit | b4109375565c6d30d8ffb63f4083e0a430aee201 (patch) | |
| tree | 2006b4c47711873199a2d8ac7ffc684e74a74448 | |
| parent | 45ef3c91c2348560a9a282b44f4b7b8b28929b6f (diff) | |
chore: fix development issues on Windows (#14030)
| -rw-r--r-- | .cargo/config | 9 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | cli/tests/integration/run_tests.rs | 2 | ||||
| -rw-r--r-- | runtime/ops/signal.rs | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/.cargo/config b/.cargo/config index bb3ca44df..0c5791d5f 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,5 +1,14 @@ [target.x86_64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] +[target.'cfg(all(windows, debug_assertions))'] +rustflags = [ + "-C", + "target-feature=+crt-static", + "-C", + # double the stack size to prevent swc overflowing the stack in debug + "link-arg=/STACK:2097152", +] + [target.aarch64-apple-darwin] rustflags = ["-C", "link-arg=-fuse-ld=lld"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1d09b4c1..8ced05b06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,8 +142,6 @@ jobs: export_default_credentials: true - name: Error on warning - # TODO(piscisaureus): enable this on Windows again. - if: "!startsWith(matrix.os, 'windows')" run: echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV - name: Configure canary build diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs index beb5e8cae..7c82acbf7 100644 --- a/cli/tests/integration/run_tests.rs +++ b/cli/tests/integration/run_tests.rs @@ -2334,7 +2334,7 @@ fn issue9750() { Input("yy\n"), Output("⚠️ ️Deno requests env access. Run again with --allow-env to bypass this prompt.\r\n Allow? [y/n (y = yes allow, n = no deny)]"), Input("n\n"), - Output("⚠️ ️Deno requests env access to \"SECRET\". Run again with --allow-run to bypass this prompt.\r\n Allow? [y/n (y = yes allow, n = no deny)]"), + Output("⚠️ ️Deno requests env access to \"SECRET\". Run again with --allow-env to bypass this prompt.\r\n Allow? [y/n (y = yes allow, n = no deny)]"), Input("n\n"), Output("error: Uncaught (in promise) PermissionDenied: Requires env access to \"SECRET\", run again with the --allow-env flag\r\n"), ], diff --git a/runtime/ops/signal.rs b/runtime/ops/signal.rs index 1da3339ac..52b5edc6b 100644 --- a/runtime/ops/signal.rs +++ b/runtime/ops/signal.rs @@ -7,8 +7,11 @@ use deno_core::error::AnyError; use deno_core::op; use deno_core::Extension; +#[cfg(unix)] use deno_core::OpState; +#[cfg(unix)] use std::cell::RefCell; +#[cfg(unix)] use std::rc::Rc; #[cfg(unix)] |