Skip to content

Commit 151b57b

Browse files
committed
ci: always use mermaid fix
1 parent 9d1924f commit 151b57b

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

.github/workflows/docs.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,35 @@ jobs:
2222
sphinx: "4.5.0"
2323
mermaid: "0.7.1"
2424
jinja: "3.1.1"
25-
mermaid_fix: "true"
2625
- version: "1.10.3"
2726
source: "tags"
2827
python: "3.10"
2928
sphinx: "4.5.0"
3029
mermaid: "0.7.1"
3130
jinja: "3.1.1"
32-
mermaid_fix: "true"
3331
- version: "master"
3432
source: "heads"
3533
python: "3.10"
3634
sphinx: "4.5.0"
3735
mermaid: "0.7.1"
3836
jinja: "3.1.1"
39-
mermaid_fix: "true"
4037
- version: "maintenance"
4138
source: "heads"
4239
python: "3.10"
4340
sphinx: "4.5.0"
4441
mermaid: "0.7.1"
4542
jinja: "3.1.1"
46-
mermaid_fix: "true"
4743
- version: "devel"
4844
source: "heads"
4945
python: "3.10"
5046
sphinx: "4.5.0"
5147
mermaid: "0.7.1"
5248
jinja: "3.1.1"
53-
mermaid_fix: "true"
5449
steps:
5550
- name: 🧾 Log event & matrix
5651
run: |
5752
echo "Event: ${{ github.event_name }} - ${{ toJson(github.event.client_payload) }}"
58-
echo "Matrix: ${{ matrix.version }}, ${{ matrix.source }}, ${{ matrix.python }}, ${{ matrix.mermaid }}, ${{ matrix.mermaid_fix }}"
53+
echo "Matrix: ${{ matrix.version }}, ${{ matrix.source }}, ${{ matrix.python }}, ${{ matrix.mermaid }}"
5954
echo "Formatted ref: ${{ format('refs/{0}/{1}', matrix.source, matrix.version) }}"
6055
6156
- name: ⬇ Checkout docs.octoprint.org
@@ -115,12 +110,8 @@ jobs:
115110
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event.client_payload.ref == format('refs/{0}/{1}', matrix.source, matrix.version)
116111
run: |
117112
cd ${{ github.workspace }}/docs.octoprint.org/util/versionselector
118-
if [[ "${{ matrix.mermaid_fix }}" == "true" ]]; then
119-
python versionselector.py ${{ github.workspace }}/OctoPrint/docs/ ${{ matrix.version }} ${{ env.OCTOPRINT_VERSION }} ${{ github.workspace }}/versions.json -D mermaid_cmd=${{ github.workspace }}/node_modules/.bin/mmdc -D mermaid_output_format=svg -D mermaid_version=
120-
echo ".rst-content object[type^='image/']{width: 100%;}" >> ${{ github.workspace }}/OctoPrint/docs/_build/html/${{ matrix.version }}/_static/theme_overrides.css
121-
else
122-
python versionselector.py ${{ github.workspace }}/OctoPrint/docs/ ${{ matrix.version }} ${{ env.OCTOPRINT_VERSION }} ${{ github.workspace }}/versions.json
123-
fi
113+
python versionselector.py ${{ github.workspace }}/OctoPrint/docs/ ${{ matrix.version }} ${{ env.OCTOPRINT_VERSION }} ${{ github.workspace }}/versions.json -D mermaid_cmd=${{ github.workspace }}/node_modules/.bin/mmdc -D mermaid_output_format=svg -D mermaid_version=
114+
echo ".rst-content object[type^='image/']{width: 100%;}" >> ${{ github.workspace }}/OctoPrint/docs/_build/html/${{ matrix.version }}/_static/theme_overrides.css
124115
125116
#- name: 🔎 Run link check
126117
# id: lc

0 commit comments

Comments
 (0)