Skip to content

Commit 568f2f1

Browse files
committed
Merge upstream/main: resolve MODULE.bazel.lock conflict
docs-as-code bump (#400) drops score_devcontainer from the graph, so the yanked-version override is obsolete and removed. Lockfile regenerated.
2 parents e369df1 + e6de5cd commit 568f2f1

4 files changed

Lines changed: 3 additions & 14 deletions

File tree

‎MODULE.bazel.lock‎

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bazel_common/score_modules_tooling.MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ git_override(
6969
bazel_dep(name = "score_docs_as_code")
7070
git_override(
7171
module_name = "score_docs_as_code",
72-
commit = "36cdc3f7a56e9651ee51ce91fd183bf3d947dd16",
72+
commit = "f1b30375e49646d95ca52565c41f5b926b0aa884",
7373
remote = "https://github.com/eclipse-score/docs-as-code.git",
7474
)
7575

‎bazel_common/unified_toolchains.MODULE.bazel‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,3 @@ unified_gcc.toolchain(
2323
version = "12.2.0",
2424
)
2525
use_repo(unified_gcc, "unified_gcc_x86_64_toolchain")
26-
27-
# score_docs_as_code@36cdc3f pulls score_devcontainer@1.11.1, which got yanked. Lives here as it is the
28-
# only file included by ref_int and by every tested module alike. Drop with the next docs_as_code bump.
29-
single_version_override(
30-
module_name = "score_devcontainer",
31-
version = "1.11.2",
32-
)

‎known_good.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
},
280280
"score_docs_as_code": {
281281
"repo": "https://github.com/eclipse-score/docs-as-code.git",
282-
"hash": "36cdc3f7a56e9651ee51ce91fd183bf3d947dd16"
282+
"hash": "f1b30375e49646d95ca52565c41f5b926b0aa884"
283283
},
284284
"score_process_description": {
285285
"repo": "https://github.com/eclipse-score/process_description.git",

0 commit comments

Comments
 (0)