From c4d0dd5d8ac9a600bc44353ef9b399a8a0bc5021 Mon Sep 17 00:00:00 2001 From: jangorecki Date: Sat, 19 Oct 2024 19:07:23 +0200 Subject: [PATCH] drop make for easier templating --- .Rbuildignore | 3 +-- .github/workflows/pkgup.yaml | 27 ++++++++++++++++++++++++--- vignettes/howto.Rmd | 1 + 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 1dcb7bf..fe465d7 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,6 +1,5 @@ ^\.github$ ^_litedown\.yml$ -^pkgup$ -^doc$ +^.pkgup$ ^Makefile$ ^public$ diff --git a/.github/workflows/pkgup.yaml b/.github/workflows/pkgup.yaml index 6cf52bb..9203e0c 100644 --- a/.github/workflows/pkgup.yaml +++ b/.github/workflows/pkgup.yaml @@ -34,14 +34,35 @@ jobs: - name: build run: | echo "Revision:" $GITHUB_SHA >> ./DESCRIPTION - make build + R CMD build . - name: check run: | - make check + R CMD check --as-cran --no-manual $(ls -1t pkgup_*.tar.gz | head -n 1) + - name: doc + if: github.ref == 'refs/heads/master' + run: | + rm -rf .pkgup/doc + mkdir -p .pkgup/doc/vignettes + rsync -r --exclude 'doc' --exclude 'repo' .pkgup/* .pkgup/doc/ + cp -r vignettes/* .pkgup/doc/vignettes/ + R CMD INSTALL $(ls -1t pkgup_*.tar.gz | head -n 1) + Rscript -e 'litedown::fuse_site(".pkgup/doc")' + #ls -aR .pkgup/doc + - name: repo + if: github.ref == 'refs/heads/master' + run: | + rm -rf .pkgup/repo + mkdir -p .pkgup/repo/src/contrib + mv "$(ls -1t pkgup_*.tar.gz | head -n 1)" .pkgup/repo/src/contrib + Rscript -e 'tools::write_PACKAGES(".pkgup/repo/src/contrib", fields="Revision")' + #ls -aR .pkgup/repo - name: public if: github.ref == 'refs/heads/master' run: | - make public + mkdir -p public + cp -r .pkgup/repo/* public + rsync -ravz --include '*/' --include='*.html' --exclude='*' .pkgup/doc/ public/ + #ls -aR public - name: upload if: github.ref == 'refs/heads/master' uses: actions/upload-pages-artifact@v1 diff --git a/vignettes/howto.Rmd b/vignettes/howto.Rmd index fcb5550..b8c5837 100644 --- a/vignettes/howto.Rmd +++ b/vignettes/howto.Rmd @@ -13,6 +13,7 @@ vignette: > ```sh cp pkgup/.github/workflows/pkgup.yaml yourpkg/.github/workflows/pkgup.yaml sed -i 's|pkgup|yourpkg|g' yourpkg/.github/workflows/pkgup.yaml +cp -r .pkgup . ``` If needed, add OS dependencies chunk in `yourpkg/.github/workflows/pkgup.yaml`