Fix EPUB; move cached releases to .versions.

This commit is contained in:
Wen Kokke 2020-07-14 18:59:27 +01:00
parent fb20064605
commit d8caea8b69
4 changed files with 13 additions and 9 deletions

View file

@ -8,6 +8,7 @@ cache:
bundler: true bundler: true
timeout: 1500 timeout: 1500
directories: directories:
- .versions
- $HOME/.stack - $HOME/.stack
- $HOME/.agda - $HOME/.agda
- $HOME/.local - $HOME/.local

View file

@ -59,8 +59,8 @@ latest/: $(addprefix plfa.github.io-web-,$(addsuffix /,$(LATEST_VERSION)))
define build_release define build_release
out := $(addsuffix /,$(1)) out := $(addsuffix /,$(1))
url := $(addprefix https://github.com/plfa/plfa.github.io/archive/web-,$(addsuffix .zip,$(1))) url := $(addprefix https://github.com/plfa/plfa.github.io/archive/web-,$(addsuffix .zip,$(1)))
tmp_zip := $(addprefix plfa.github.io-web-,$(addsuffix .zip,$(1))) tmp_zip := $(addprefix .versions/plfa.github.io-web-,$(addsuffix .zip,$(1)))
tmp_dir := $(addprefix plfa.github.io-web-,$(addsuffix /,$(1))) tmp_dir := $(addprefix .versions/plfa.github.io-web-,$(addsuffix /,$(1)))
baseurl := $(addprefix /,$(1)) baseurl := $(addprefix /,$(1))
$$(tmp_zip): tmp_zip = $(addprefix plfa.github.io-web-,$(addsuffix .zip,$(1))) $$(tmp_zip): tmp_zip = $(addprefix plfa.github.io-web-,$(addsuffix .zip,$(1)))
@ -68,22 +68,26 @@ $$(tmp_zip): url = $(addprefix https://github.com/plfa/plfa.github.io/archive/we
$$(tmp_zip): $$(tmp_zip):
wget -c $$(url) -O $$(tmp_zip) wget -c $$(url) -O $$(tmp_zip)
$$(tmp_dir): tmp_dir = $(addprefix plfa.github.io-web-,$(addsuffix /,$(1))) $$(tmp_dir): tmp_dir = $(addprefix .versions/plfa.github.io-web-,$(addsuffix /,$(1)))
$$(tmp_dir): tmp_zip = $(addprefix plfa.github.io-web-,$(addsuffix .zip,$(1))) $$(tmp_dir): tmp_zip = $(addprefix .versions/plfa.github.io-web-,$(addsuffix .zip,$(1)))
$$(tmp_dir): $$(tmp_zip) $$(tmp_dir): $$(tmp_zip) | .versions/
unzip -qq $$(tmp_zip) unzip -qq $$(tmp_zip)
$$(out): out = $(addsuffix /,$(1)) $$(out): out = $(addsuffix /,$(1))
$$(out): url = $(addprefix https://github.com/plfa/plfa.github.io/archive/web-,$(addsuffix .zip,$(1))) $$(out): url = $(addprefix https://github.com/plfa/plfa.github.io/archive/web-,$(addsuffix .zip,$(1)))
$$(out): tmp_dir = $(addprefix plfa.github.io-web-,$(addsuffix /,$(1))) $$(out): tmp_dir = $(addprefix .versions/plfa.github.io-web-,$(addsuffix /,$(1)))
$$(out): baseurl = $(addprefix /,$(1)) $$(out): baseurl = $(addprefix /,$(1))
$$(out): $$(tmp_dir) $$(out): $$(tmp_dir)
cd $$(tmp_dir) && $(JEKYLL) clean && $(JEKYLL) build --destination '../$$(out)' --baseurl '$$(baseurl)' cd $$(tmp_dir) && $(JEKYLL) clean && $(JEKYLL) build --destination '../../$$(out)' --baseurl '$$(baseurl)'
endef endef
# Incorporate previous releases of PLFA web version # Incorporate previous releases of PLFA web version
$(foreach release_version,$(RELEASE_VERSIONS),$(eval $(call build_release,$(release_version)))) $(foreach release_version,$(RELEASE_VERSIONS),$(eval $(call build_release,$(release_version))))
.versions/:
mkdir -p .versions
# Convert literal Agda to Markdown using highlight.sh # Convert literal Agda to Markdown using highlight.sh
define AGDA_template define AGDA_template
in := $(1) in := $(1)

View file

@ -60,7 +60,7 @@ exclude:
- "papers/" - "papers/"
- "slides/" - "slides/"
- "vendor/" - "vendor/"
- "plfa.github.io-web-*/" - "versions/"
- "*.agdai" - "*.agdai"
- "*.agda-lib" - "*.agda-lib"
- "*.lagda.md" - "*.lagda.md"

View file

@ -67,7 +67,6 @@ src/plfa/part2/Substitution.lagda.md
``` {.include shift-heading-level-by=1} ``` {.include shift-heading-level-by=1}
out/epub/acknowledgements.md out/epub/acknowledgements.md
src/plfa/Fonts.lagda.md src/plfa/Fonts.lagda.md
src/plfa/statistics.md
``` ```
<!-- TODO: include the rest of the stuff on https://plfa.github.io/ --> <!-- TODO: include the rest of the stuff on https://plfa.github.io/ -->