[EXP] Attempt to fix Windows build

cloudflare · Jan 25, 2025 · 040672d · 040672d
1 parent 8519d5e
commit 040672d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/_bazel.yml b/.github/workflows/_bazel.yml
@@ -87,7 +87,7 @@ jobs:
       - name: Bazel test
         if: inputs.run_tests
         run: |
-          bazel test --config=ci --config=ci-${{ inputs.os_name }}${{ inputs.suffix }} --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev ${{ inputs.extra_bazel_args }} //...
+          bazel test --config=ci --config=ci-${{ inputs.os_name }}${{ inputs.suffix }} --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev ${{ inputs.extra_bazel_args }} //src/workerd/api:rtti-test //src/workerd/server:server-test
       - name: Report disk usage (in MB)
         if: always()
         shell: bash

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -66,8 +66,7 @@ jobs:
       image: ${{ matrix.os.image }}
       os_name: ${{ matrix.os.name }}
       suffix: ${{ matrix.config.suffix }}
-      # TODO: Debug Windows issues
-      extra_bazel_args: "--remote_download_all --noexperimental_inprocess_symlink_creation"
+      extra_bazel_args: "--config=ci-test"
     secrets:
       BAZEL_CACHE_KEY: ${{ secrets.BAZEL_CACHE_KEY }}
       WORKERS_MIRROR_URL: ${{ secrets.WORKERS_MIRROR_URL }}

diff --git a/build/js_capnp_library.bzl b/build/js_capnp_library.bzl
@@ -85,7 +85,6 @@ def js_capnp_library(
         deps = [],
         src_prefix = "",
         visibility = None,
-        target_compatible_with = None,
         **kwargs):
     """Bazel rule to create a JavaScript capnproto library from capnp source files
 
@@ -97,7 +96,6 @@ def js_capnp_library(
         deps: other js_capnp_library rules to depend on
         src_prefix: src_prefix for capnp compiler to the source root
         visibility: rule visibility
-        target_compatible_with: target compatibility
         **kwargs: rest of the arguments to js_library rule
     """
 
@@ -112,13 +110,11 @@ def js_capnp_library(
         outs = js_files + d_ts_files,
         src_prefix = src_prefix,
         visibility = visibility,
-        target_compatible_with = target_compatible_with,
     )
     js_library(
         name = name,
         srcs = js_files + d_ts_files,
         deps = deps + ["//:node_modules/capnp-ts"],
         visibility = visibility,
-        target_compatible_with = target_compatible_with,
         **kwargs
     )
diff --git a/src/node/BUILD.bazel b/src/node/BUILD.bazel
@@ -21,5 +21,9 @@ wd_ts_bundle(
     ]),
     schema_id = "0xbcc8f57c63814005",
     tsconfig_json = "tsconfig.json",
-    deps = ["//:node_modules/@types/node"],
+    deps = [
+        "//:node_modules/@types/node",
+        "//:node_modules/@workerd/jsg",
+        "//:node_modules/capnp-ts",
+    ],
 )
diff --git a/src/pyodide/BUILD.bazel b/src/pyodide/BUILD.bazel
@@ -198,7 +198,7 @@ js_file(
 esbuild(
     name = "generated/emscriptenSetup",
     srcs = glob([
-        "internal/pool/*",
+        "internal/pool/*.ts",
     ]) + [
         "generated/pyodide.asm.js",
         "internal/util.ts",

diff --git a/src/wpt/BUILD.bazel b/src/wpt/BUILD.bazel
@@ -9,14 +9,15 @@ srcs = glob(
 
 ts_project(
     name = "wpt-test-harness",
-    testonly = False,
     srcs = srcs,
     allow_js = True,
     declaration = True,
     tsconfig = "tsconfig.json",
     visibility = ["//visibility:public"],
     deps = [
         "//:node_modules/@types/node",
+        #"//:node_modules/@workerd/jsg",
+        "//:node_modules/capnp-ts",
     ],
 )