Skip to content

Commit

Permalink
[build] Clean up Bazel tags, fix excessive Windows warnings
Browse files Browse the repository at this point in the history
- Disable Dawn diagnostic leading to excessive warning volume on Windows
- Drop check for libc++ >= 15, we have required LLVM 15 for a while.
- Don't mark workerd binary as no-arm64, which caused problems for downstream
  where it still needs to be built.
- Drop superfluous CI filter overrides – we already set the filters to
  off-by-default in the global config.
- Drop "slow" bazel tag – this has been superseded by the "enormous" size filter.
  • Loading branch information
fhanau committed Nov 22, 2024
1 parent 9614788 commit c51874a
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ build --per_file_copt='external@-Wno-error'
build --per_file_copt='external/v8@-Wno-deprecated-declarations'
build --per_file_copt='external/com_googlesource_chromium_icu@-Wno-ambiguous-reversed-operator,-Wno-deprecated-declarations'
build --host_per_file_copt='external/com_googlesource_chromium_icu@-Wno-ambiguous-reversed-operator,-Wno-deprecated-declarations'
build --per_file_copt='external/dawn@-Wno-shorten-64-to-32,-Wno-unneeded-internal-declaration'
build --host_per_file_copt='external/dawn@-Wno-shorten-64-to-32,-Wno-unneeded-internal-declaration'
build --per_file_copt='external/dawn@-Wno-shorten-64-to-32,-Wno-unneeded-internal-declaration,-Wno-deprecated-this-capture'
build --host_per_file_copt='external/dawn@-Wno-shorten-64-to-32,-Wno-unneeded-internal-declaration,-Wno-deprecated-this-capture'
build --per_file_copt='external/zlib@-Wno-unknown-warning-option,-Wno-deprecated-non-prototype'
build --host_per_file_copt='external/zlib@-Wno-unknown-warning-option,-Wnodeprecated-non-prototype'
# for some reason tcmalloc uses internal msan-enabled annotation in the code, rather than public one
Expand Down
5 changes: 2 additions & 3 deletions build/ci.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:ci-test --remote_download_outputs=minimal
# LLVM produces a bit more debug info on macOS by default to facilitate debugging with
# LLDB. This is not needed for this use case, so disable it using -fno-standalone-debug –
# this is already the default for Linux/Windows.
build:ci-limit-storage --build_tag_filters=-off-by-default,-slow,-benchmark
build:ci-limit-storage --build_tag_filters=-off-by-default,-benchmark
build:ci-limit-storage --copt="-g1"
build:ci-limit-storage --copt="-fno-standalone-debug"

Expand All @@ -55,8 +55,7 @@ build:ci-linux --config=ci-linux-common
# Some tests (like Python import tests) take a long time to run and don't benefit much
# from multi-platform testing. For that reason, we only run them in a single configuration
# to minimize effect on CI pipeline runtime.
build:ci-linux --build_tag_filters=-off-by-default
test:ci-linux --test_tag_filters=-off-by-default --test_size_filters=small,medium,large,enormous
test:ci-linux --test_size_filters=small,medium,large,enormous

build:ci-linux-debug --config=ci-linux-common --config=ci-limit-storage
build:ci-linux-debug --config=debug --config=rust-debug
Expand Down
10 changes: 0 additions & 10 deletions src/workerd/jsg/iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,13 @@ class GeneratorImpl {
friend Generator;
};

#if _LIBCPP_VERSION >= 15000
template <class Func, class T>
concept GeneratorCallback = std::invocable<Func, Lock&, T, GeneratorContext<T>&> &&
std::same_as<void, std::invoke_result_t<Func, Lock&, T, GeneratorContext<T>&>>;

template <class Func, class T>
concept AsyncGeneratorCallback = std::invocable<Func, Lock&, T, GeneratorContext<T>&> &&
std::same_as<Promise<void>, std::invoke_result_t<Func, Lock&, T, GeneratorContext<T>&>>;
#else
// These don't work in libc++ 11. I haven't tried 12-14, but they do work in 15. So we'll just
// skip the extra type checking if we don't have libc++ 15 or newer.
template <class Func, class T>
concept GeneratorCallback = true;

template <class Func, class T>
concept AsyncGeneratorCallback = true;
#endif

template <typename T>
class Generator final {
Expand Down
1 change: 0 additions & 1 deletion src/workerd/server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ wd_cc_binary(
name = "workerd",
srcs = ["workerd.c++"],
malloc = ":malloc",
tags = ["no-arm64"],
visibility = ["//visibility:public"],
deps = [
":server",
Expand Down
1 change: 0 additions & 1 deletion src/workerd/server/tests/python/import_tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,5 @@ def gen_import_tests(to_test):
src = wd_test_fname,
args = ["--experimental", "--pyodide-package-disk-cache-dir", "../all_pyodide_wheels"],
data = [worker_py_fname, "@all_pyodide_wheels//:whls"],
tags = ["slow"],
size = "enormous",
)

0 comments on commit c51874a

Please sign in to comment.