Meta: use Makefile from deploy.sh

Avoids duplication and hopefully keeps strictness consistent.

Co-authored-by: Michael[tm] Smith <[email protected]>

Author: annevk

Makefile

@@ -1,6 +1,7 @@
 SHELL=/bin/bash
 
 bs_installed  := $(shell command -v bikeshed 2> /dev/null)
+node_installed := $(shell command -v node 2> /dev/null)
 npm_installed := $(shell command -v npm 2> /dev/null)
 pp_webidl_installed := $(shell npm ls webidl-grammar-post-processor --parseable --depth=0 2> /dev/null)
 
@@ -10,12 +11,15 @@ index.html : index.bs
 ifdef bs_installed
 	bikeshed spec --die-on=warning index.bs
 else
+ifndef TRAVIS
 	@echo Can\'t find a local version of Bikeshed. To install it, visit:
 	@echo
 	@echo https://github.com/tabatkins/bikeshed/blob/master/docs/install.md
 	@echo
 	@echo Trying to build the spec using the online API at: https://api.csswg.org/bikeshed/
 	@echo This will fail if you are not connected to the network.
+	@echo
+endif
 	@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
 	                       --output index.html \
 	                       --write-out "%{http_code}" \
@@ -28,11 +32,20 @@ else
 		exit 22 \
 	);
 endif
+ifdef node_installed
+	node ./check-grammar.js index.html
+else ifdef TRAVIS
+	exit 1
+else
+	@echo You need node for grammer checking.
+endif
 ifdef pp_webidl_installed
 	npm run pp-webidl -- --input index.html
 else ifdef npm_installed
 	npm install
 	npm run pp-webidl -- --input index.html
+else ifdef TRAVIS
+	exit 1
 else
 	@echo You need node.js and npm to apply post-processing. To install it, visit:
 	@echo

deploy.sh

@@ -5,9 +5,8 @@ SOURCE_BRANCH="master"
 TARGET_BRANCH="gh-pages"
 
 function doCompile {
-  curl https://api.csswg.org/bikeshed/ -f -F [email protected] > out/index.html
-  node ./check-grammar.js ./out/index.html
-  npm run pp-webidl -- --input ./out/index.html
+  make
+  mv index.html ./out/index.html
 }
 
 # Pull requests and commits to other branches shouldn't try to deploy, just build to verify