Skip to content

Commit 5fecc89

Browse files
authored
chore: use mdtest normalise to prepare examples for mkdocs (#347)
1 parent fd8c2fd commit 5fecc89

File tree

5 files changed

+67
-33
lines changed

5 files changed

+67
-33
lines changed

.ci/docs/prepare_info_texts_for_mkdocs.py

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

.ci/tools/go.mod

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module github.com/UpCloudLtd/upcloud-cli/tools
2+
3+
go 1.23.2
4+
5+
require github.com/UpCloudLtd/mdtest v0.0.0-20241218095607-687f26589c4c
6+
7+
require (
8+
github.com/UpCloudLtd/progress v1.0.3 // indirect
9+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10+
github.com/jedib0t/go-pretty/v6 v6.6.5 // indirect
11+
github.com/mattn/go-runewidth v0.0.16 // indirect
12+
github.com/rivo/uniseg v0.4.7 // indirect
13+
github.com/spf13/cobra v1.8.1 // indirect
14+
github.com/spf13/pflag v1.0.5 // indirect
15+
golang.org/x/sys v0.28.0 // indirect
16+
golang.org/x/term v0.27.0 // indirect
17+
golang.org/x/text v0.21.0 // indirect
18+
)

.ci/tools/go.sum

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
github.com/UpCloudLtd/mdtest v0.0.0-20241218095607-687f26589c4c h1:tJD6Sm3pKMySNSCZCySYwx76f713vVHjnCJWDbDLYwE=
2+
github.com/UpCloudLtd/mdtest v0.0.0-20241218095607-687f26589c4c/go.mod h1:bb9tb8kvg8INEgPFulXaqHGbyIjxNsqVWF2wy6X7G9Q=
3+
github.com/UpCloudLtd/progress v1.0.3 h1:8SfntHkBPyQc5BL3946Bgi9KYnQOxa5RR2EKdadujdg=
4+
github.com/UpCloudLtd/progress v1.0.3/go.mod h1:iGxOnb9HvHW0yrLGUjHr0lxHhn7TehgWwh7a8NqK6iQ=
5+
github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
6+
github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
7+
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
8+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
9+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10+
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
11+
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
12+
github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3NgSqAo=
13+
github.com/jedib0t/go-pretty/v6 v6.6.5/go.mod h1:Uq/HrbhuFty5WSVNfjpQQe47x16RwVGXIveNGEyGtHs=
14+
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
15+
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
16+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
17+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
18+
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
19+
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
20+
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
21+
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
22+
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
23+
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
24+
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
25+
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
26+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
27+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
28+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
29+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
30+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
31+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
32+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
33+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
34+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
35+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
36+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

.ci/tools/tools.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//go:build tools
2+
// +build tools
3+
4+
package main
5+
6+
import (
7+
_ "github.com/UpCloudLtd/mdtest"
8+
)

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ BIN_FREEBSD = $(CLI_BIN)-$(VERSION)-freebsd-amd64
2626
V = 0
2727
Q = $(if $(filter 1,$V),,@)
2828

29+
TOOLS_DIR:=$(CURDIR)/.ci/bin
30+
2931
export GO111MODULE=on
3032

3133
.PHONY: build
@@ -45,7 +47,7 @@ clean-md-docs:
4547
md-docs: clean-md-docs ## Generate documentation (markdown)
4648
$(GO) run ./.ci/docs/
4749
cp CHANGELOG.md docs/changelog.md
48-
cp -r examples/ docs/examples/
50+
mkdir -p docs/examples/
4951

5052
.PHONY: clean-docs
5153
clean-docs:
@@ -55,11 +57,12 @@ clean-docs:
5557
.PHONY: install-docs-tools
5658
install-docs-tools:
5759
$(PIP) install -r requirements.txt
60+
cd .ci/tools && GOBIN=$(TOOLS_DIR) go install github.com/UpCloudLtd/mdtest
5861

5962
.PHONY: docs
6063
docs: clean-docs md-docs install-docs-tools ## Generate documentation (mkdocs site)
64+
$(TOOLS_DIR)/mdtest normalise examples/ -o docs/examples/ -t filename=title --quote-values always
6165
$(PYTHON) .ci/docs/generate_dynamic_nav.py
62-
$(PYTHON) .ci/docs/prepare_info_texts_for_mkdocs.py
6366
echo "latest_release: $(LATEST_RELEASE)" > vars.yaml
6467
mkdocs build
6568

0 commit comments

Comments
 (0)