slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make site: log to site.log again

Browse Source 
[ci skip]
This commit is contained in:
Simon Michael 2019-03-06 09:24:44 -08:00
parent e5f3dd1a75
commit 7b94b0c9b2
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -712,7 +712,10 @@ site: \
$(call def-help,site, update the hledger.org website (run on prod) ) $(call def-help,site, update the hledger.org website (run on prod) )
@[[ ! -x Shake ]] \ @[[ ! -x Shake ]] \
&& echo 'Please run "make Shake" first (manual compilation of Shake.hs is required)' \ && echo 'Please run "make Shake" first (manual compilation of Shake.hs is required)' \
|| ./Shake hledgerorg || ( \
echo; \
./Shake hledgerorg \
) 2>&1 | tee -a site.log
############################################################################### ###############################################################################
$(call def-help-subheading,RELEASING:) $(call def-help-subheading,RELEASING:)

12
Shake.hs
View File

@ -447,19 +447,13 @@ main = do
-- 2. cron, nightly. Config: /etc/crontab -- 2. cron, nightly. Config: /etc/crontab
-- 3. manually (make site). -- 3. manually (make site).
phony "hledgerorg" $ do phony "hledgerorg" $ do
-- out1 <- fromStdout <$> -- XXX ideally we would ensure here that output is logged in site.log,
cmd_ Shell
-- XXX ideally we would ensure here that output is logged,
-- but I don't know how to do that for the Shake rules. -- but I don't know how to do that for the Shake rules.
-- Instead we'll do the logging in "make site". -- Instead we'll do the logging in "make site".
-- -- run this sequence of commands, stopping if one fails: cmd_ Shell
-- "("
-- -- and log all output as well as echoing it
-- ") 2>&1 | tee -a site.log"
-- print timestamp. On mac, use brew-installed GNU date. -- print timestamp. On mac, use brew-installed GNU date.
"echo" "PATH=\"/usr/local/opt/coreutils/libexec/gnubin:$PATH\" date --rfc-3339=seconds"
"&& PATH=\"/usr/local/opt/coreutils/libexec/gnubin:$PATH\" date --rfc-3339=seconds"
-- pull latest wiki repo -- pull latest wiki repo
"&& printf 'wiki repo: ' && git -C wiki pull" "&& printf 'wiki repo: ' && git -C wiki pull"
-- pull latest main repo - sometimes already done by webhook, not always -- pull latest main repo - sometimes already done by webhook, not always