diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-11 16:45:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 16:45:55 +0200 |
| commit | f73c3b868de36454bc8affeb63b4dc6f2c6da351 (patch) | |
| tree | 71300d2c3b22cc4cc1aa118e7d03565c8fa627f5 | |
| parent | 093013b099cd2397fdf3aedc213d182064be5d27 (diff) | |
| parent | ba7e863ac32fa0acd4b081eded4c2935405f1eda (diff) | |
| download | podman-f73c3b868de36454bc8affeb63b4dc6f2c6da351.tar.gz podman-f73c3b868de36454bc8affeb63b4dc6f2c6da351.tar.bz2 podman-f73c3b868de36454bc8affeb63b4dc6f2c6da351.zip | |
Merge pull request #3973 from baude/validateupdate
add lint and manpage check to make validate
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | Makefile | 5 |
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}' @@ -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) |