From b5a26c7ece804966a6b1d16aaf4e2fb2f831ebbc Mon Sep 17 00:00:00 2001 From: Andreas Rossberg Date: Wed, 12 Jun 2024 18:15:34 +0200 Subject: [PATCH] Ship CR --- .github/workflows/w3c-publish.yml | 2 +- document/core/Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/w3c-publish.yml b/.github/workflows/w3c-publish.yml index d68183abfc..250df600ba 100644 --- a/.github/workflows/w3c-publish.yml +++ b/.github/workflows/w3c-publish.yml @@ -30,7 +30,7 @@ jobs: - name: Publish all specs to their https://www.w3.org/TR/ URLs run: cd document && make -e WD-echidna-CI env: - STATUS: --md-status=WD + W3C_STATUS: CR W3C_ECHIDNA_TOKEN_CORE: ${{ secrets.W3C_ECHIDNA_TOKEN_CORE }} W3C_ECHIDNA_TOKEN_JSAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_JSAPI }} W3C_ECHIDNA_TOKEN_WEBAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_WEBAPI }} diff --git a/document/core/Makefile b/document/core/Makefile index 3ac2f1c814..c608d13bbd 100644 --- a/document/core/Makefile +++ b/document/core/Makefile @@ -2,6 +2,7 @@ # # You can set these variables from the command line. +W3C_STATUS = WD SPHINXOPTS = SPHINXBUILD = sphinx-build PAPER = a4 @@ -154,7 +155,7 @@ bikeshed: $(GENERATED) @echo @echo ========================================================================= mkdir -p $(BUILDDIR)/bikeshed_mathjax/ - bikeshed spec $(STATUS) index.bs $(BUILDDIR)/bikeshed_mathjax/index.html + bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/bikeshed_mathjax/index.html mkdir -p $(BUILDDIR)/html/bikeshed/ (cd util/katex/ && yarn && yarn build && npm install --only=prod) python3 util/mathjax2katex.py $(BUILDDIR)/bikeshed_mathjax/index.html \ @@ -196,7 +197,7 @@ WD-echidna: WD-tar -F "tar=@$(BUILDDIR)/WD.tar" \ -F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt @echo - @echo "Published working draft. Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`" + @echo "Published $(W3C_STATUS). Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`" .PHONY: WD-echidna-CI WD-echidna-CI: WD-tar @@ -210,7 +211,7 @@ WD-echidna-CI: WD-tar -F "token=$(W3C_ECHIDNA_TOKEN_CORE)" \ -F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt @echo - @echo "Published working draft. Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`" + @echo "Published $(W3C_STATUS). Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`" .PHONY: diff diff: bikeshed