From 1f980c8ccce4c1b5298440074e455f30e4cdfc79 Mon Sep 17 00:00:00 2001 From: Chris Harrelson Date: Sun, 26 Jan 2025 17:19:02 -0800 Subject: [PATCH 1/2] Remove draft mode - book is now done --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 987149b66..6a122a825 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: book draft widgets publish clean download wc lint examples +.PHONY: book widgets publish clean download wc lint examples FLAGS= @@ -16,7 +16,6 @@ EXAMPLE_JS=$(patsubst src/example%.js,%,$(wildcard src/example*.js)) EXAMPLE_CSS=$(patsubst src/example%.css,%,$(wildcard src/example*.css)) book: $(patsubst %,www/%.html,$(CHAPTERS)) www/rss.xml widgets examples www/index.html -draft: $(patsubst %,www/draft/%.html,$(CHAPTERS)) www/onepage.html widgets examples: $(patsubst %,www/examples/example%.html,$(EXAMPLE_HTML)) \ $(patsubst %,www/examples/example%.js,$(EXAMPLE_JS)) \ $(patsubst %,www/examples/example%.css,$(EXAMPLE_CSS)) @@ -77,9 +76,6 @@ latex/book.pdf: latex/book.tex latex/macros.tex www/%.html: book/%.md infra/template.html infra/signup.html infra/filter.lua config.json src/lab*.py $(PANDOC) --toc --metadata=mode:book --template infra/template.html -c book.css $< -o $@ -www/draft/%.html: book/%.md infra/template.html infra/signup.html infra/filter.lua config.json - $(PANDOC) --toc --metadata=mode:draft --template infra/template.html -c book.css $< -o $@ - www/rss.xml: news.yaml infra/rss-template.xml pandoc --template infra/rss-template.xml -f markdown -t html $< -o $@ @@ -102,7 +98,7 @@ bottle.py: wc: @ printf " Words Code File\n"; awk -f infra/wc.awk book/*.md | sort -rn -publish: book draft widgets +publish: book widgets rsync -rtu --exclude=db.json --exclude=*.hash www/ server:/var/www/wbe/ ssh server chmod -Rf a+r /var/www/wbe/ || true From d9916b68912906e18cb2da083f356ad1008712c2 Mon Sep 17 00:00:00 2001 From: Chris Harrelson Date: Sun, 26 Jan 2025 17:52:24 -0800 Subject: [PATCH 2/2] none --- .github/workflows/compare.yml | 2 +- www/draft/.gitignore | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 www/draft/.gitignore diff --git a/.github/workflows/compare.yml b/.github/workflows/compare.yml index 3b84dc535..010f3e313 100644 --- a/.github/workflows/compare.yml +++ b/.github/workflows/compare.yml @@ -16,4 +16,4 @@ jobs: - uses: r-lib/actions/setup-pandoc@v2 with: pandoc-version: 3.2.1 - - run: make book draft lint + - run: make book lint diff --git a/www/draft/.gitignore b/www/draft/.gitignore deleted file mode 100644 index e69de29bb..000000000