summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-09-09 09:41:05 -0500
committerbaude <bbaude@redhat.com>2019-09-10 05:45:59 -0500
commitba7e863ac32fa0acd4b081eded4c2935405f1eda (patch)
treea237ee62540f7429226b04bd6b407d7fc71ccdcc
parent7042a3d7a539bae79ed63bdc87f432b8ec73afd8 (diff)
downloadpodman-ba7e863ac32fa0acd4b081eded4c2935405f1eda.tar.gz
podman-ba7e863ac32fa0acd4b081eded4c2935405f1eda.tar.bz2
podman-ba7e863ac32fa0acd4b081eded4c2935405f1eda.zip
add lint and manpage check to make validate
make validate now runs golangci-lint and the man-page-checker to ensure a PR is ready for our CI system. Signed-off-by: baude <bbaude@redhat.com>
-rw-r--r--.cirrus.yml2
-rw-r--r--Makefile5
2 files changed, 4 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index d41828d5d..39275f6db 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -104,14 +104,12 @@ gating_task:
# N/B: entrypoint.sh resets $GOSRC (same as make clean)
- '/usr/local/bin/entrypoint.sh install.tools |& ${TIMESTAMP}'
- '/usr/local/bin/entrypoint.sh validate |& ${TIMESTAMP}'
- - '/usr/local/bin/entrypoint.sh golangci-lint |& ${TIMESTAMP}'
# This task builds Podman with different buildtags to ensure the build does
# not break. It also verifies all sub-commands have man pages.
build_script:
- '/usr/local/bin/entrypoint.sh podman |& ${TIMESTAMP}'
- 'cd $GOSRC && ./hack/podman-commands.sh |& ${TIMESTAMP}'
- - 'cd $GOSRC && ./hack/man-page-checker |& ${TIMESTAMP}'
# N/B: need 'clean' so some commited files are re-generated.
- '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}'
- '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}'
diff --git a/Makefile b/Makefile
index 4f51adb67..3b50f751b 100644
--- a/Makefile
+++ b/Makefile
@@ -315,6 +315,9 @@ docs: $(MANPAGES) ## Generate documentation
install-podman-remote-docs: docs
@(cd docs; ./podman-remote.sh ./remote)
+man-page-check:
+ ./hack/man-page-checker
+
# When publishing releases include critical build-time details
.PHONY: release.txt
release.txt:
@@ -505,7 +508,7 @@ validate.completions: completions/bash/podman
. completions/bash/podman
if [ -x /bin/zsh ]; then /bin/zsh completions/zsh/_podman; fi
-validate: gofmt .gitvalidation validate.completions
+validate: gofmt .gitvalidation validate.completions golangci-lint man-page-check
build-all-new-commits:
# Validate that all the commits build on top of $(GIT_BASE_BRANCH)