Skip to content

Commit 1debb3a

Browse files
hzellerhzeller
committed
Use or-tools from Bazel Central Registry.
Or-tools is now available in BCR google/or-tools#4551 This implicitly also pushed protobuf, abseil-cpp and fuzztest dependencies, so make that state of versions explicit in the root project. Newer protobuf does not compile with clang 17 anymore [^1], so update clang (this might also help fix some clang-format differences we see in issue google#2006) protoc-gen-validate did not work with newer protobuf rules anymore, but luckily it got updated in BCR in the meantime ans works without local patch now. Grpc now also exhibit a compile error, so update that to head as well. Issues: google#931 [^1]: protocolbuffers/protobuf#20645
1 parent 8a3b8b0 commit 1debb3a

6 files changed

Lines changed: 3810 additions & 82 deletions

File tree

‎.github/workflows/continuous-integration.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ jobs:
2828
- name: Run pre-commit checks
2929
run: pre-commit run --all-files --show-diff-on-failure
3030

31+
- name: Install dependencies via apt
32+
run: |
33+
sudo apt-get install -y python3-dev python-is-python3 build-essential liblapack-dev libblas-dev gfortran libtinfo6
34+
3135
- name: Restore Nightly Bazel Cache
3236
uses: actions/cache/restore@v4
3337
with:
3438
path: "~/.cache/bazel"
3539
key: bazel-cache-nightly-${{ runner.os }}-${{ github.sha }}
3640
restore-keys: bazel-cache-nightly-${{ runner.os }}-
3741

38-
- name: Install dependencies via apt
39-
run: sudo apt-get install python3-dev python-is-python3 build-essential liblapack-dev libblas-dev gfortran
40-
4142
- name: Bazel Build Tools (opt)
4243
run: |
4344
bazel build --config=ci -c opt --noshow_progress --test_output=errors -- //xls/dslx:interpreter_main //xls/dslx/ir_convert:ir_converter_main //xls/tools:opt_main //xls/tools:codegen_main

‎MODULE.bazel‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@ bazel_dep(name = "toolchains_llvm", version = "1.3.0")
99
# Configure and register the toolchain.
1010
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
1111
llvm.toolchain(
12-
llvm_version = "17.0.6",
12+
llvm_version = "18.1.7",
1313
)
1414
use_repo(llvm, "llvm_toolchain")
1515

1616
register_toolchains("@llvm_toolchain//:all")
1717

1818
# Root module dependencies.
1919
# Note: some WORKSPACE dependencies still require repo_name aliases.
20-
bazel_dep(name = "abseil-cpp", version = "20240722.1", repo_name = "com_google_absl")
20+
bazel_dep(name = "abseil-cpp", version = "20250127.0", repo_name = "com_google_absl")
2121
bazel_dep(name = "abseil-py", version = "2.1.0")
2222
bazel_dep(name = "bazel_features", version = "1.25.0")
2323
bazel_dep(name = "bazel_skylib", version = "1.7.1")
2424
bazel_dep(name = "boringssl", version = "0.20250114.0")
2525
bazel_dep(name = "cppitertools", version = "2.2")
2626
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
27-
bazel_dep(name = "grpc", version = "1.69.0")
27+
bazel_dep(name = "grpc", version = "1.71.0")
2828
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
29+
bazel_dep(name = "or-tools", version = "9.12", repo_name = "com_google_ortools")
2930
bazel_dep(name = "platforms", version = "0.0.11")
30-
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
31+
bazel_dep(name = "protobuf", version = "30.1", repo_name = "com_google_protobuf")
3132
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
3233
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c")
3334
bazel_dep(name = "rules_license", version = "1.0.0")
@@ -36,7 +37,7 @@ bazel_dep(name = "rules_proto", version = "7.1.0")
3637
bazel_dep(name = "verible", version = "0.0.3933")
3738

3839
# Dev dependencies
39-
bazel_dep(name = "fuzztest", version = "20241028.0", dev_dependency = True, repo_name = "com_google_fuzztest")
40+
bazel_dep(name = "fuzztest", version = "20250214.0", dev_dependency = True, repo_name = "com_google_fuzztest")
4041
bazel_dep(name = "google_benchmark", version = "1.9.1", dev_dependency = True)
4142
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)
4243

@@ -46,13 +47,7 @@ bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)
4647
bazel_dep(name = "rules_bison", version = "0.3")
4748
bazel_dep(name = "rules_flex", version = "0.3")
4849
bazel_dep(name = "rules_java", version = "8.7.2")
49-
bazel_dep(name = "protoc-gen-validate", version = "1.0.4.bcr.2")
50-
single_version_override(
51-
module_name = "protoc-gen-validate",
52-
patch_strip = 1,
53-
patches = ["//dependency_support:protoc-gen-validate/no-rulescc.patch"],
54-
version = "1.0.4.bcr.2",
55-
)
50+
bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1")
5651

5752
# compilation DB; build_cleaner
58-
bazel_dep(name = "bant", version = "0.1.14", dev_dependency=True)
53+
bazel_dep(name = "bant", version = "0.2.0", dev_dependency = True)

0 commit comments

Comments
 (0)