Skip to content

Commit e3e856f

Browse files
authored
Joho some fixes (#167)
* fix labels * use sphinx lobster from the lobster repo * relocate lobster config * fix ci * increase filesize limit
1 parent df4d4e2 commit e3e856f

21 files changed

Lines changed: 21 additions & 281 deletions

.github/workflows/tests.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
steps:
2121
- name: Checkout repository
2222
uses: actions/checkout@v6.0.2
23+
- name: Install Missing Dependencies
24+
run: |
25+
sudo apt-get update
26+
sudo apt-get install -y libcairo2-dev
2327
- name: Run python_basics integration tests
2428
run: |
2529
cd python_basics/integration_tests
@@ -38,3 +42,9 @@ jobs:
3842
- name: Run rules_score tests
3943
run: |
4044
bazel test //bazel/rules/rules_score/...
45+
- name: Run Plantuml Tooling tests
46+
run: |
47+
bazel test //plantuml/...
48+
- name: Run Validation Tooling tests
49+
run: |
50+
bazel test //validation/...

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repos:
2121
- id: check-shebang-scripts-are-executable
2222
- id: check-executables-have-shebangs
2323
- id: check-added-large-files
24-
args: [--maxkb=50, --enforce-all] # increase or add git lfs if too strict
24+
args: [--maxkb=100, --enforce-all] # increase or add git lfs if too strict
2525
exclude: org.eclipse.dash.licenses-1.1.0.jar|blanket_index.html
2626
- repo: https://github.com/google/yamlfmt
2727
rev: 21ca5323a9c87ee37a434e0ca908efc0a89daa07 # v0.21.0

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ git_override(
255255
bazel_dep(name = "lobster", version = "0.0.0")
256256
git_override(
257257
module_name = "lobster",
258-
commit = "94ed5961ca28ee1b840cd8a938138c17ae4da671",
258+
commit = "d528fbdec2cd72ff7967b51546fb0bd935810258",
259259
remote = "https://github.com/bmw-software-engineering/lobster.git",
260260
)
261261

bazel/rules/rules_score/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ py_binary(
8888
visibility = ["//visibility:public"],
8989
deps = [
9090
":sphinx_module_ext",
91-
"//tools/sphinx/extensions/lobster",
91+
"@lobster//sphinx_lobster:sphinx_lobster_builder",
9292
"@score_docs_as_code//src/extensions/score_metamodel",
9393
"@score_tooling//plantuml/sphinx/clickable_plantuml",
9494
"@trlc//tools/sphinx/extensions/trlc",
@@ -132,7 +132,7 @@ py_binary(
132132
main = "src/sphinx_wrapper.py",
133133
visibility = ["//visibility:public"],
134134
deps = [
135-
"//tools/sphinx/extensions/lobster",
135+
"@lobster//sphinx_lobster:sphinx_lobster_builder",
136136
"@score_docs_as_code//src/extensions/score_metamodel",
137137
"@score_tooling//plantuml/sphinx/clickable_plantuml",
138138
"@trlc//tools/sphinx/extensions/trlc",
File renamed without changes.

bazel/rules/rules_score/config/lobster_comp_req.yaml renamed to bazel/rules/rules_score/lobster/config/lobster_comp_req.yaml

File renamed without changes.

bazel/rules/rules_score/config/lobster_component.conf.tpl renamed to bazel/rules/rules_score/lobster/config/lobster_component.conf.tpl

File renamed without changes.

bazel/rules/rules_score/config/lobster_controlmeasures.yaml renamed to bazel/rules/rules_score/lobster/config/lobster_controlmeasures.yaml

File renamed without changes.

bazel/rules/rules_score/config/lobster_de.conf.tpl renamed to bazel/rules/rules_score/lobster/config/lobster_de.conf.tpl

File renamed without changes.

bazel/rules/rules_score/config/lobster_failuremodes.yaml renamed to bazel/rules/rules_score/lobster/config/lobster_failuremodes.yaml

File renamed without changes.

0 commit comments

Comments
 (0)