Skip to content

Commit d7b1639

Browse files
committed
Bump dependency versions in MODULE.bazel
1 parent 68dcbc2 commit d7b1639

File tree

6 files changed

+47
-109
lines changed

6 files changed

+47
-109
lines changed

.bazelrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ common:macos --features=-supports_dynamic_linker --linkopt=-framework --linkopt=
2929
# Since we use designated initializers (C99 ... but >= c++20), compiler really wants the c++20 mode
3030
common:windows --compiler=clang-cl --cxxopt=/std:c++20 --host_cxxopt=/std:c++20 --client_env=BAZEL_CXXOPTS=/std:c++20
3131

32+
build --cxxopt="-Wno-unknown-warning-option" --host_cxxopt="-Wno-unknown-warning-option"
33+
# TODO: this looks like benign where it happens but to be explored further
34+
build --cxxopt="-Wno-dangling-reference" --host_cxxopt="-Wno-dangling-reference"
35+
# Newer bisons create an unused label.
36+
build --cxxopt="-Wno-unused-label" --host_cxxopt="-Wno-unused-label"
37+
3238
# For 3rd party code: Disable warnings entirely.
3339
# They are not actionable and just create noise.
3440
build --per_file_copt=external/.*@-w

.github/workflows/verible-ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
path: |
104104
/root/.cache/clang-tidy
105105
/root/.cache/bazel
106-
key: clang-tidy1-${{ steps.cache_timestamp.outputs.time }}
107-
restore-keys: clang-tidy1-
106+
key: clang-tidy2-${{ steps.cache_timestamp.outputs.time }}
107+
restore-keys: clang-tidy2-
108108

109109
- name: Build Project genrules
110110
run: |
@@ -115,7 +115,8 @@ jobs:
115115
//verible/verilog/parser:verilog-lex \
116116
//verible/verilog/parser:verilog-y \
117117
//verible/verilog/parser:verilog-y-final \
118-
//verible/common/analysis:command-file-lexer_test
118+
//verible/common/analysis:command-file-lexer_test \
119+
//verible/common/lsp:lsp-text-buffer
119120
bazel build $(bin/bant -q genrule-outputs | awk '{print $2}') \
120121
$(bin/bant list-targets | grep cc_proto_library | awk '{print $3}')
121122
@@ -437,14 +438,14 @@ jobs:
437438
uses: actions/cache@v3
438439
with:
439440
path: "c:/users/runneradmin/_bazel_runneradmin"
440-
key: bazelcache_windows1_${{ steps.cache_timestamp.outputs.time }}
441-
restore-keys: bazelcache_windows1_
441+
key: bazelcache_windows3_${{ steps.cache_timestamp.outputs.time }}
442+
restore-keys: bazelcache_windows3_
442443

443444
- name: Install dependencies
444445
run: |
445446
choco install bazel --force --version=6.5.0
446447
choco install winflexbison3
447-
choco install llvm --allow-downgrade --version=16.0.6
448+
choco install llvm --allow-downgrade --version=17.0.6
448449
449450
- name: Debug bazel directory settings
450451
# We need to explicitly call the bazel binary from choco, otherwise

MODULE.bazel

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ module(
22
name = "verible",
33
)
44

5-
bazel_dep(name = "platforms", version = "0.0.8")
6-
bazel_dep(name = "bazel_skylib", version = "1.5.0")
7-
bazel_dep(name = "rules_license", version = "0.0.8")
8-
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
9-
bazel_dep(name = "rules_cc", version = "0.0.9")
5+
bazel_dep(name = "platforms", version = "0.0.10")
6+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
7+
bazel_dep(name = "rules_license", version = "1.0.0")
8+
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1", repo_name = "jsonhpp")
9+
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
10+
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
1011

11-
# Register m4 rules and toolchain.
12+
# Register m4/flex/bison rules and toolchains
1213
bazel_dep(name = "rules_m4", version = "0.2.3")
1314

1415
m4 = use_extension(
@@ -24,23 +25,6 @@ use_repo(m4, "m4")
2425

2526
register_toolchains("@m4//:toolchain")
2627

27-
# Register bison rules and toolchain.
28-
bazel_dep(name = "rules_bison", version = "0.3")
29-
30-
bison = use_extension(
31-
"@rules_bison//bison/extensions:bison_repository_ext.bzl",
32-
"bison_repository_ext",
33-
)
34-
bison.repository(
35-
name = "bison",
36-
extra_copts = ["-O3"],
37-
version = "3.3.2",
38-
)
39-
use_repo(bison, "bison")
40-
41-
register_toolchains("@bison//:toolchain")
42-
43-
# Register flex rules and toolchain.
4428
bazel_dep(name = "rules_flex", version = "0.3")
4529

4630
flex = use_extension(
@@ -56,9 +40,25 @@ use_repo(flex, "flex")
5640

5741
register_toolchains("@flex//:toolchain")
5842

43+
bazel_dep(name = "rules_bison", version = "0.3")
44+
45+
bison = use_extension(
46+
"@rules_bison//bison/extensions:bison_repository_ext.bzl",
47+
"bison_repository_ext",
48+
)
49+
bison.repository(
50+
name = "bison",
51+
extra_copts = ["-O3"],
52+
version = "3.3.2",
53+
)
54+
use_repo(bison, "bison")
55+
56+
register_toolchains("@bison//:toolchain")
57+
5958
# abseil-cpp and googletest can not be updated beyond the following currently,
6059
# as newer googletest is not compatible with bazel 6 anymore, and abseil-cpp
61-
# depends on it :( -- to support all active bazel's, we're stuck till Dec 2025.
60+
# depends on it :( -- to support all active bazel's, we're stuck till EOL bazel6
61+
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
6262
bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
6363
single_version_override(
6464
module_name = "abseil-cpp",
@@ -67,8 +67,10 @@ single_version_override(
6767
version = "20240116.2",
6868
)
6969

70-
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
71-
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1", repo_name = "jsonhpp")
72-
bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf")
73-
bazel_dep(name = "re2", version = "2023-09-01", repo_name = "com_googlesource_code_re2")
74-
bazel_dep(name = "zlib", version = "1.3.1")
70+
# Last protobuf version working with windows without strange linking errors.
71+
# This also means that we unfortunately can't use the @protobuf//bazel rules
72+
# but have to use rules_cc and rules_proto.
73+
# TODO: figure out how we can make proto compile beyond 24.4 on Windows.
74+
bazel_dep(name = "protobuf", version = "24.4", repo_name = "com_google_protobuf")
75+
bazel_dep(name = "rules_cc", version = "0.0.9")
76+
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ the nix package manager simply run `nix-shell` to get a build environment.
183183

184184
```bash
185185
# Build all tools and libraries
186-
# bazel 5/6/7
186+
# bazel 6/7/8
187187
bazel build -c opt //...
188188
```
189189

bazel/zlib.BUILD

Lines changed: 0 additions & 73 deletions
This file was deleted.

third_party/proto/kythe/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Unfortunately, can't use @com_google_protobuf//bazel:cc_proto_library.bzl
2+
# here, as this does not seem to work with windows.
13
load("@rules_cc//cc:defs.bzl", "cc_proto_library")
24
load("@rules_proto//proto:defs.bzl", "proto_library")
35

0 commit comments

Comments
 (0)