Skip to content

Commit d0eed32

Browse files
authored
fix: modernize bazel module configuration and resolve CI lockfile issues (#427)
- Update rules_java to use the modern 'toolchains' extension in MODULE.bazel, replacing the legacy repository rule for JDK registration. - Resolve "duplicate artifact versions" warnings in CI by forcing specific versions for Guava, Truth, Gson, and Error Prone annotations in java.MODULE.bazel. - Correct the rules_python uv extension path and hub repository name to align with requirements for rules_python v1.8.1. - Update the CI lockfile workflow to use 'uv export --no-emit-workspace', preventing local workspace members from being included as editable requirements in the generated requirements.txt, which fixes Bazel build failures in CI.
1 parent bf4a8c2 commit d0eed32

File tree

3 files changed

+46
-16
lines changed

3 files changed

+46
-16
lines changed

.github/workflows/release-please.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
working-directory: python
7777
run: |
7878
uv sync
79-
uv export --format requirements-txt --output-file requirements.txt --hashes
79+
uv export --format requirements-txt --output-file requirements.txt --hashes --no-emit-workspace
8080
8181
- name: Update Cargo.lock
8282
run: |
@@ -93,7 +93,7 @@ jobs:
9393
- name: Update Bazel lockfiles
9494
run: |
9595
bazel mod tidy
96-
bazel run @maven//:pin || echo "Maven pin failed, skipping..."
96+
REPIN=1 bazel run @maven//:pin || echo "Maven pin failed, skipping..."
9797
bazel build ...
9898
9999
- name: Check for changes

java.MODULE.bazel

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ use_extension("@rules_java//java:extensions.bzl", "toolchains")
2626
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
2727
maven.install(
2828
artifacts = [
29-
"junit:junit:4.13.2",
30-
"com.google.truth.extensions:truth-proto-extension:1.4.4",
31-
"com.google.truth:truth:1.4.4",
3229
"com.github.jknack:handlebars:4.4.0",
3330
"com.google.guava:guava:33.5.0-jre",
3431
"com.fasterxml.jackson.core:jackson-databind:2.20.1",
3532
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1",
33+
"com.google.code.gson:gson:2.10.1",
34+
"com.google.errorprone:error_prone_annotations:2.23.0",
3635
],
3736
known_contributing_modules = [
3837
"bazel_worker_java",
@@ -44,4 +43,41 @@ maven.install(
4443
"https://repo1.maven.org/maven2",
4544
],
4645
)
46+
maven.artifact(
47+
testonly = True,
48+
artifact = "junit",
49+
group = "junit",
50+
version = "4.13.2",
51+
)
52+
maven.artifact(
53+
testonly = True,
54+
artifact = "truth-proto-extension",
55+
group = "com.google.truth.extensions",
56+
version = "1.4.4",
57+
)
58+
maven.artifact(
59+
artifact = "guava",
60+
force_version = True,
61+
group = "com.google.guava",
62+
version = "33.5.0-jre",
63+
)
64+
maven.artifact(
65+
testonly = True,
66+
artifact = "truth",
67+
force_version = True,
68+
group = "com.google.truth",
69+
version = "1.4.4",
70+
)
71+
maven.artifact(
72+
artifact = "gson",
73+
force_version = True,
74+
group = "com.google.code.gson",
75+
version = "2.10.1",
76+
)
77+
maven.artifact(
78+
artifact = "error_prone_annotations",
79+
force_version = True,
80+
group = "com.google.errorprone",
81+
version = "2.23.0",
82+
)
4783
use_repo(maven, "maven")

maven_install.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1259725505,
4-
"__RESOLVED_ARTIFACTS_HASH": 2121750228,
3+
"__INPUT_ARTIFACTS_HASH": 693145947,
4+
"__RESOLVED_ARTIFACTS_HASH": -1005206781,
55
"conflict_resolution": {
6-
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.10.1",
7-
"com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.41.0",
8-
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.41.0",
9-
"com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.5.0-jre",
10-
"com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.5.0-jre",
11-
"com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.1",
12-
"com.google.truth:truth:1.4.0": "com.google.truth:truth:1.4.4"
6+
"com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.1"
137
},
148
"artifacts": {
159
"com.fasterxml.jackson.core:jackson-annotations": {
@@ -62,9 +56,9 @@
6256
},
6357
"com.google.errorprone:error_prone_annotations": {
6458
"shasums": {
65-
"jar": "a56e782b5b50811ac204073a355a21d915a2107fce13ec711331ad036f660fcc"
59+
"jar": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054"
6660
},
67-
"version": "2.41.0"
61+
"version": "2.23.0"
6862
},
6963
"com.google.guava:failureaccess": {
7064
"shasums": {

0 commit comments

Comments
 (0)