Skip to content

Commit 5b51069

Browse files
committed
Remove old vendored go-md2man
The version of go-md2man is quite old, and is not really need to be in this repository. It is only used by `make docs` which does not make sense to run in CI, as we don't check the resulting man page. PS if needed, it is easy to install by this one-liner: go install github.com/cpuguy83/go-md2man/v2@latest Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
1 parent 58e4cf4 commit 5b51069

32 files changed

+4
-6299
lines changed

Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ vendor:
9292
GO111MODULE=on $(GO) mod verify
9393

9494
.PHONY: docs
95-
ifeq ($(GOMD2MAN),)
96-
docs: install.tools
97-
endif
9895
docs:
9996
$(MAKE) -C docs
10097

@@ -123,13 +120,10 @@ install.podman: bin/conmon
123120
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(LIBEXECDIR)/podman
124121
install ${SELINUXOPT} -m 755 bin/conmon $(DESTDIR)$(LIBEXECDIR)/podman/conmon
125122

126-
install.tools:
127-
$(MAKE) -C tools
128-
129123
.PHONY: fmt
130124
fmt:
131-
find . '(' -name '*.h' -o -name '*.c' ! -path './vendor/*' ! -path './tools/vendor/*' ')' -exec clang-format -i {} \+
132-
find . -name '*.go' ! -path './vendor/*' ! -path './tools/vendor/*' -exec gofmt -s -w {} \+
125+
find . '(' -name '*.h' -o -name '*.c' ! -path './vendor/*' ')' -exec clang-format -i {} \+
126+
find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+
133127
git diff --exit-code
134128

135129

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PREFIX ?= /usr/local
22
DATADIR := ${PREFIX}/share
33
MANDIR := $(DATADIR)/man
4-
GOMD2MAN ?= ../tools/build/go-md2man
4+
GOMD2MAN ?= go-md2man
55

66
docs: $(patsubst %.md,%,$(wildcard *.8.md))
77

hack/github-actions-setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ install_packages() {
8080
}
8181

8282
install_conmon() {
83-
sudo make install
83+
sudo make install.bin
8484
conmon --version
8585
}
8686

tools/Makefile

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

tools/go.mod

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

tools/go.sum

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

tools/tools.go

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

tools/vendor/github.com/cpuguy83/go-md2man/.gitignore

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

tools/vendor/github.com/cpuguy83/go-md2man/.travis.yml

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

tools/vendor/github.com/cpuguy83/go-md2man/Dockerfile

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

0 commit comments

Comments
 (0)