chore: moved installation of mermaid js tools out of makefile

.github/workflows/pages.yml

@@ -34,6 +34,8 @@ jobs:
         uses: actions/configure-pages@v2
       - name: Install Bikeshed
         run: pip3 install bikeshed && bikeshed update
+      - name: Install Mermaid
+        run: npm install -g @mermaid-js/mermaid-cli
       - name: Build specs
         run: make -C spec publish && make -C spec/v2 publish && make -C spec/faq publish
       - name: Upload artifact

.gitignore

@@ -1,3 +1,4 @@
 index.html
 upload/
 *.svg
+.DS_Store

spec/release.sh

@@ -2,6 +2,7 @@
 
 cd spec/v2
 pip3 install bikeshed && bikeshed update
+npm list -g @mermaid-js/mermaid-cli || npm install -g @mermaid-js/mermaid-cli
 mv header.include header.include_temp
 mv header.include_release header.include
 rm index.html

spec/v2/Makefile

@@ -1,6 +1,7 @@
+# Assumes bikeshed is installed (pip3 install bikeshed)
+# Assumes mmdc is installed (npm install -g @mermaid-js/mermaid-cli)
 DIAGRAMS := $(patsubst %.mmd,%.svg,$(wildcard diagrams/*.mmd))
 OUTDIR := ../../upload/v2
-MMDC := mmdc
 STATUS ?= ""
 
 all: index.html
@@ -18,14 +19,11 @@ index.html: index.bs $(DIAGRAMS)
 	bikeshed spec $< $@ --md-text-macro="$(STATUS)"
 
 %.svg: %.mmd $(MMDC)
-	$(MMDC) -i $< -o $@
+	mmdc -i $< -o $@
 
 serve: $(DIAGRAMS)
 	bikeshed serve index.bs
 
-$(MMDC):
-	npm install -g @mermaid-js/mermaid-cli
-
 pull-metadata:
 	curl -o computed-metadata.include https://raw.githubusercontent.com/wbcsd/tr/main/data-exchange-protocol/computed-metadata.include