mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-18 17:57:11 +03:00
make deploy: also do a push if we updated wiki links, to allow pulls
This commit is contained in:
parent
0b5ff2906d
commit
38e7e378bd
6
Makefile
6
Makefile
@ -984,11 +984,11 @@ site/index.md: wiki/_Sidebar.md \
|
||||
> site/_index.md.$$$$ && \
|
||||
mv site/_index.md.$$$$ site/index.md
|
||||
|
||||
site/index.md-commit: \
|
||||
$(call def-help,site/index.md, update home page with ./wiki/_Sidebar content and commit if changed )
|
||||
site/index.md-push: \
|
||||
$(call def-help,site/index.md-push, update home page with ./wiki/_Sidebar content and commit and do a git push if changed )
|
||||
git diff --quiet site/index.md && \
|
||||
make -s site/index.md && \
|
||||
( git diff --quiet site/index.md || git commit -q -m 'site: home: update from wiki' -m '[ci skip]' site/index.md )
|
||||
( git diff --quiet site/index.md || (git commit -q -m 'site: home: update from wiki' -m '[ci skip]' site/index.md && git push) )
|
||||
|
||||
site-clean: site/hakyll-std/hakyll-std \
|
||||
$(call def-help,site-clean, remove hakyll-generated files (& take down the website) ) #cleanolddocs
|
||||
|
@ -19,8 +19,8 @@ echo && date --rfc-3339=seconds && \
|
||||
# fetch latest wiki content
|
||||
printf "wiki: " && git -C wiki pull && \
|
||||
|
||||
# add latest wiki sidebar links to home page
|
||||
make --no-print-directory site/index.md-commit && \
|
||||
# add latest wiki sidebar links to home page, and push right away so we can keep pulling
|
||||
make --no-print-directory site/index.md-push && \
|
||||
|
||||
# ensure GHC can handle non-ascii
|
||||
export LANG=en_US.UTF-8 && \
|
||||
|
Loading…
Reference in New Issue
Block a user