Skip to content

Commit

Permalink
[EXP] Attempt to fix Windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
fhanau committed Jan 25, 2025
1 parent 8519d5e commit 4928ac3
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
6f7faa659e5eb3e56c8a6274ebcb86884703d603
# Bazel release-8.1.0 branch
8.0.1
2 changes: 1 addition & 1 deletion .github/workflows/_bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 6 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ npm_link_package(
package = "@workerd/jsg",
)

npm_link_package(
name = "node_modules/@workerd/jsg2",
src = "//src/workerd/jsg:jsg_js2",
package = "@workerd/jsg2",
)

capnpc_ts_bin.capnpc_ts_binary(
name = "capnpc_ts",
visibility = ["//visibility:public"],
Expand Down
6 changes: 4 additions & 2 deletions build/js_capnp_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,15 @@ def js_capnp_library(
outs = js_files + d_ts_files,
src_prefix = src_prefix,
visibility = visibility,
target_compatible_with = target_compatible_with,
# target_compatible_with = target_compatible_with,
tags = ["manual"],
)
js_library(
name = name,
srcs = js_files + d_ts_files,
deps = deps + ["//:node_modules/capnp-ts"],
visibility = visibility,
target_compatible_with = target_compatible_with,
# target_compatible_with = target_compatible_with,
tags = ["manual"],
**kwargs
)
5 changes: 4 additions & 1 deletion src/node/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ wd_ts_bundle(
]),
schema_id = "0xbcc8f57c63814005",
tsconfig_json = "tsconfig.json",
deps = ["//:node_modules/@types/node"],
deps = [
"//:node_modules/@types/node",
"//:node_modules/@workerd/jsg",
],
)
2 changes: 1 addition & 1 deletion src/pyodide/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ js_file(
esbuild(
name = "generated/emscriptenSetup",
srcs = glob([
"internal/pool/*",
"internal/pool/*.ts",
]) + [
"generated/pyodide.asm.js",
"internal/util.ts",
Expand Down
10 changes: 10 additions & 0 deletions src/workerd/jsg/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ npm_package(
visibility = ["//visibility:public"],
)

npm_package(
name = "jsg_js2",
srcs = [":rtti_capnp_js"],
# Required to ensure source files are copied when running internal builds
# that depend on `workerd` as an external repository
include_external_repositories = ["workerd"],
publishable = False,
visibility = ["//visibility:public"],
)

wd_cc_library(
name = "rtti",
hdrs = ["rtti.h"],
Expand Down
3 changes: 2 additions & 1 deletion src/wpt/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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/jsg2",
"//:node_modules/@workerd/jsg",
],
)

Expand Down

0 comments on commit 4928ac3

Please sign in to comment.