Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only install pkgdown for website build #1900

Merged
merged 2 commits into from
Sep 14, 2020
Merged

Conversation

cderv
Copy link
Collaborator

@cderv cderv commented Sep 14, 2020

This should fix the travis build for R 3.3. It reverts 97142d9 but we can revert again when new systemfonts hits CRAN.

This will fix the travis build. It reverts 97142d9 but we can revert again when new systemfonts hits CRAN.
@cderv cderv changed the title only install pkgdown for build only install pkgdown for website build Sep 14, 2020
@cderv cderv requested a review from yihui September 14, 2020 15:16
@cderv
Copy link
Collaborator Author

cderv commented Sep 14, 2020

This will prevent build failure until systemfonts hits CRAN.
However, we really don't need to install pkgdown for all R versions. Only the one we use for the pkgdown building.

Travis is not easy to control cache or installation behavior. We can't also easily use RSPM binaries. This could change if we swtich to GHA.

Copy link
Member

@yihui yihui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Thank you!

@yihui
Copy link
Member

yihui commented Sep 14, 2020

I didn't really want pkgdown to be in Suggests. Let's see if before_cache works.

@cderv
Copy link
Collaborator Author

cderv commented Sep 14, 2020

We should try also to be more precise with the if , as pkgdown is required only in specific case

rmarkdown/.travis.yml

Lines 34 to 36 in 1a96753

after_success:
- "[[ ${TRAVIS_BRANCH} = master ]] || exit 0"
- "[[ -z ${NETLIFY_AUTH_TOKEN} ]] && exit 0"

no need to install it each time. But if caches works, I guess it is the same. I lost my travis skills now that I recently played with GHA 😅

@yihui
Copy link
Member

yihui commented Sep 14, 2020

We should try also to be more precise with the if

As usual, you are absolutely correct! :)

Edit: well, on second thought, since this package will be cached most of the time (the cache will be available to PRs and other branches), it shouldn't hurt to go without the if condition. The worst case is Travis installs pkgdown when it's unnecessary, but that should be rare. So I'm going to merge this PR without adding the extra rigor.

@yihui yihui merged commit 949c7e3 into rstudio:master Sep 14, 2020
@cderv
Copy link
Collaborator Author

cderv commented Sep 14, 2020

But if caches works, I guess it is the same

That is what I thought too. Sometimes I am being a bit to rigourous 😄
Thanks !

@cderv cderv deleted the pkgdown-build-only branch September 14, 2020 16:25
jonathan-g added a commit to jonathan-g/rmarkdown that referenced this pull request Sep 24, 2020
* rstudio_origin/master:
  fix rstudio#1905: a chunk with the class "fold-hide" should only hide itself (rstudio#1906)
  bump version after merging rstudio#1899
  lua filter -> Lua filter
  Add an argument `lua_filters` to pandoc_options() to store them in the output format object (rstudio#1899)
  recursve into the parent dir at the end
  also suppor dir input in proj_root()
  list.files() with full.names = TRUE (so the files could be read with corret paths), and pass down the `file`/`pattern` arguments in the recursion
  use our own proj_root() instead of introducing a dependency
  rename package_root() to proj_root()
  generalize the package_root() function to work with more types of projects
  Discover site generators in index.Rmd files in parent directories (rstudio#1898)
  only install pkgdown for website build (rstudio#1900)
  Generalize number sections (rstudio#1879)
  enable figure cropping in pdf_document() only when both pdfcrop and ghostscript are found (yihui/knitr#954), and do not limit this feature to non-Windows platforms
  add the citation entry for the R Markdown Cookbook
  add lua filter vignette to pkgdown website (rstudio#1894)
  close rstudio#1889: evaluate the output argument before changing working directory in pandoc_convert() (rstudio#1890)
jonathan-g added a commit to jonathan-g/rmarkdown that referenced this pull request Sep 24, 2020
Merge remote-tracking branch 'rstudio_origin/master' into css-slash-fix

# By Yihui Xie (12) and others
# Via GitHub
* rstudio_origin/master: (22 commits)
  fix rstudio#1905: a chunk with the class "fold-hide" should only hide itself (rstudio#1906)
  bump version after merging rstudio#1899
  lua filter -> Lua filter
  Add an argument `lua_filters` to pandoc_options() to store them in the output format object (rstudio#1899)
  recursve into the parent dir at the end
  also suppor dir input in proj_root()
  list.files() with full.names = TRUE (so the files could be read with corret paths), and pass down the `file`/`pattern` arguments in the recursion
  use our own proj_root() instead of introducing a dependency
  rename package_root() to proj_root()
  generalize the package_root() function to work with more types of projects
  Discover site generators in index.Rmd files in parent directories (rstudio#1898)
  only install pkgdown for website build (rstudio#1900)
  Generalize number sections (rstudio#1879)
  enable figure cropping in pdf_document() only when both pdfcrop and ghostscript are found (yihui/knitr#954), and do not limit this feature to non-Windows platforms
  add the citation entry for the R Markdown Cookbook
  add lua filter vignette to pkgdown website (rstudio#1894)
  close rstudio#1889: evaluate the output argument before changing working directory in pandoc_convert() (rstudio#1890)
  tweak news
  require Pandoc >= 1.14
  xfun 0.16 is on CRAN now
  ...

# Conflicts:
#	NEWS.md
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants