From f4fcef8228ebd5a1a73bc6edc47b5efa259c2e20 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 23 Mar 2022 10:32:36 +0100 Subject: Use 'investr' conditionally in tests, updates Most prominently, a README was added, giving a nice overview for the people visiting the github page, the package page on CRAN, or the online docs at pkgdown.jrwb.de. The maintainer e-mail address was also updated. --- GNUmakefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 9eee6b9..b7404b6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -18,7 +18,7 @@ pkgfiles = \ man/* \ NAMESPACE \ NEWS.md \ - README.html \ + README.md \ R/* \ tests/* \ tests/testthat* @@ -30,8 +30,9 @@ $(TGZ): $(pkgfiles) vignettes build: $(TGZ) -README.html: README.md - "$(RBIN)/Rscript" -e "rmarkdown::render('README.md', output_format = 'html_document')" +README.html: README.rmd + "$(RBIN)/Rscript" -e "rmarkdown::render('README.rmd', clean = FALSE)" + mv README.knit.md README.md install: build "$(RBIN)/R" CMD INSTALL $(TGZ) @@ -56,7 +57,7 @@ winbuilder: build curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/ test: install - NOT_CRAN=true "$(RBIN)/Rscript" -e 'devtools::test()' 2>&1 | tee test.log + NOT_CRAN=true "$(RBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test.log sed -i -e "s/\r.*\r//" test.log clean: -- cgit v1.2.1