Skip to content

Commit

Permalink
[R-package] add 'cleanup' script to handle left-behind Makevars (#3434)
Browse files Browse the repository at this point in the history
* [R-package] add 'cleanup' script to handle left-behind Makevars

* always install library for checkbashisms
  • Loading branch information
jameslamb committed Oct 4, 2020
1 parent 0fc4c5c commit 2903ca0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 8 additions & 6 deletions .ci/test_r_package.sh
Expand Up @@ -29,6 +29,8 @@ fi
# installing precompiled R for Ubuntu
# https://cran.r-project.org/bin/linux/ubuntu/#installation
# adding steps from https://stackoverflow.com/a/56378217/3986677 to get latest version
#
# `devscripts` is required for 'checkbashisms' (https://github.com/r-lib/actions/issues/111)
if [[ $OS_NAME == "linux" ]]; then
sudo apt-key adv \
--keyserver keyserver.ubuntu.com \
Expand All @@ -39,6 +41,7 @@ if [[ $OS_NAME == "linux" ]]; then
sudo apt-get install \
--no-install-recommends \
-y --allow-downgrades \
devscripts \
r-base-dev=${R_LINUX_VERSION} \
texinfo \
texlive-latex-recommended \
Expand All @@ -47,25 +50,24 @@ if [[ $OS_NAME == "linux" ]]; then
qpdf \
|| exit -1

# https://github.com/r-lib/actions/issues/111

if [[ $R_BUILD_TYPE == "cran" ]]; then
sudo apt-get install \
--no-install-recommends \
-y \
autoconf=$(cat R-package/AUTOCONF_UBUNTU_VERSION) \
devscripts \
|| exit -1
fi
fi

# Installing R precompiled for Mac OS 10.11 or higher
if [[ $OS_NAME == "macos" ]]; then
if [[ $R_BUILD_TYPE == "cran" ]]; then
brew install \
automake \
checkbashisms
brew install automake
fi
brew install qpdf
brew install \
checkbashisms \
qpdf
brew cask install basictex
export PATH="/Library/TeX/texbin:$PATH"
sudo tlmgr --verify-repo=none update --self
Expand Down
2 changes: 2 additions & 0 deletions R-package/cleanup
@@ -0,0 +1,2 @@
#!/bin/sh
rm -f src/Makevars

0 comments on commit 2903ca0

Please sign in to comment.