From ff462e9852cddaf0ff0c14f0dbd46ef151e718e0 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 18 Jul 2019 20:00:19 +1000 Subject: [PATCH 1/2] build: skip test-ci doc targets if no crypto --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e14edb2a034173..c00773374c748a 100644 --- a/Makefile +++ b/Makefile @@ -488,7 +488,11 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a CI_NATIVE_SUITES ?= addons js-native-api node-api CI_JS_SUITES ?= default -CI_DOC := doctool +ifeq ($(node_use_openssl), false) + CI_DOC := doctool +else + CI_DOC = +endif .PHONY: test-ci-native # Build and test addons without building anything else @@ -700,7 +704,11 @@ tools/doc/node_modules: tools/doc/package.json .PHONY: doc-only doc-only: tools/doc/node_modules \ $(apidoc_dirs) $(apiassets) ## Builds the docs with the local or the global Node.js binary. - @$(MAKE) out/doc/api/all.html out/doc/api/all.json + @if [ "$(shell $(node_use_openssl))" != "true" ]; then \ + echo "Skipping doc-only (no crypto)"; \ + else \ + @$(MAKE) out/doc/api/all.html out/doc/api/all.json; \ + fi .PHONY: doc doc: $(NODE_EXE) doc-only From 4c0da8de22535c6806607b4190dfe5cb4aeeccfd Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 18 Jul 2019 20:34:28 +1000 Subject: [PATCH 2/2] fixup! build: skip test-ci doc targets if no crypto --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c00773374c748a..58387ab6dd4d41 100644 --- a/Makefile +++ b/Makefile @@ -707,7 +707,7 @@ doc-only: tools/doc/node_modules \ @if [ "$(shell $(node_use_openssl))" != "true" ]; then \ echo "Skipping doc-only (no crypto)"; \ else \ - @$(MAKE) out/doc/api/all.html out/doc/api/all.json; \ + $(MAKE) out/doc/api/all.html out/doc/api/all.json; \ fi .PHONY: doc