diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-05-18 11:18:26 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-05-19 14:13:12 +0200 |
| commit | 5bac37cb14f1e056891a0339d42b5c6db4344553 (patch) | |
| tree | b4ad46d2011071b5fa2311a11ef8a8c06ff4dba0 | |
| parent | Add bounds checking to length returned by wcslen in wide_to_asc conversion to... (diff) | |
| download | openssl-5bac37cb14f1e056891a0339d42b5c6db4344553.tar.xz openssl-5bac37cb14f1e056891a0339d42b5c6db4344553.zip | |
unix-Makefile.tmpl and ci.yml: Merge cmd-nits into doc-nits
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15329)
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 9 | ||||
| -rwxr-xr-x | util/find-doc-nits | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71750aec7a..46a096cb75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,8 +37,8 @@ jobs: run: ./config --banner=Configured --strict-warnings enable-fips && perl configdata.pm --dump - name: make build_generated run: make -s build_generated - - name: make doc-nits cmd-nits - run: make doc-nits cmd-nits + - name: make doc-nits + run: make doc-nits # This checks that we use ANSI C language syntax and semantics. # We are not as strict with libraries, but rather adapt to what's diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 8b45e75f57..92e181befb 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -569,7 +569,7 @@ clean: libclean -find . -name '*{- platform->depext() -}' \! -name '.*' \! -type d -exec $(RM) {} \; -find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -exec $(RM) {} \; $(RM) core - $(RM) tags TAGS doc-nits cmd-nits md-nits + $(RM) tags TAGS doc-nits md-nits $(RM) -r test/test-runs $(RM) providers/fips*.new $(RM) openssl.pc libcrypto.pc libssl.pc @@ -1064,12 +1064,9 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects \ generate_buildinfo: generate_doc_buildinfo -.PHONY: doc-nits cmd-nits md-nits +.PHONY: doc-nits md-nits doc-nits: build_generated_pods - $(PERL) $(SRCDIR)/util/find-doc-nits -n -l -e - -cmd-nits: build_generated_pods - $(PERL) $(SRCDIR)/util/find-doc-nits -c + $(PERL) $(SRCDIR)/util/find-doc-nits -c -n -l -e # This uses "mdl", the markdownlint application, which is written in ruby. # The source is at https://github.com/markdownlint/markdownlint diff --git a/util/find-doc-nits b/util/find-doc-nits index 8a27a00bdf..e8439b8626 100755 --- a/util/find-doc-nits +++ b/util/find-doc-nits @@ -1141,8 +1141,6 @@ if ( $opt_c ) { checkflags($cmd, @doc); } } - - exit $status; } # Populate %state |