From f1ac311edbb1ca44ee2d6da5f6fa8478d9bc3faa Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 25 Mar 2023 14:59:21 -0500 Subject: [PATCH 1/5] [ci] fix LaTeX tools installation in R jobs (fixes #5802) --- .ci/test_r_package.sh | 1 + .ci/test_r_package_windows.ps1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index dbc76f061114..b7af507a87b9 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -77,6 +77,7 @@ fi # Installing R precompiled for Mac OS 10.11 or higher if [[ $OS_NAME == "macos" ]]; then + brew update-reset && brew update if [[ $R_BUILD_TYPE == "cran" ]]; then brew install automake || exit -1 fi diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index e4d20de50b90..c93db3b27011 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -88,7 +88,7 @@ if ($env:R_MAJOR_VERSION -eq "3") { $env:R_LIB_PATH = "$env:BUILD_SOURCESDIRECTORY/RLibrary" -replace '[\\]', '/' $env:R_LIBS = "$env:R_LIB_PATH" -$env:PATH = "$env:RTOOLS_BIN;" + "$env:RTOOLS_MINGW_BIN;" + "$env:R_LIB_PATH/R/bin/x64;"+ $env:PATH +$env:PATH = "$env:RTOOLS_BIN;" + "$env:RTOOLS_MINGW_BIN;" + "$env:R_LIB_PATH/R/bin/x64;" + "C:\TinyTex\bin\win32;" + "C:\TinyTex\bin\windows;" + $env:PATH $env:CRAN_MIRROR = "https://cran.rstudio.com" $env:MIKTEX_EXCEPTION_PATH = "$env:TEMP\miktex" From 04cfb9a994f7b9ba0ee1b3bd3bbd9bcc018d7d6f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 25 Mar 2023 15:09:35 -0500 Subject: [PATCH 2/5] remove --cask --- .ci/test_r_package.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index b7af507a87b9..1c3bcd6faca9 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -77,14 +77,13 @@ fi # Installing R precompiled for Mac OS 10.11 or higher if [[ $OS_NAME == "macos" ]]; then - brew update-reset && brew update if [[ $R_BUILD_TYPE == "cran" ]]; then brew install automake || exit -1 fi brew install \ checkbashisms \ qpdf || exit -1 - brew install --cask basictex || exit -1 + brew install basictex || exit -1 export PATH="/Library/TeX/texbin:$PATH" sudo tlmgr --verify-repo=none update --self || exit -1 sudo tlmgr --verify-repo=none install inconsolata helvetic rsfs || exit -1 From a93bb8c953f16fbb84cfc170eccaecc80fe16413 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 25 Mar 2023 15:50:37 -0500 Subject: [PATCH 3/5] put update back --- .ci/test_r_package.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index 1c3bcd6faca9..b179d401a476 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -77,6 +77,7 @@ fi # Installing R precompiled for Mac OS 10.11 or higher if [[ $OS_NAME == "macos" ]]; then + brew update-reset && brew update if [[ $R_BUILD_TYPE == "cran" ]]; then brew install automake || exit -1 fi From 7ff754a3a65e6d1519c7a1b528a5548282709854 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 25 Mar 2023 17:27:12 -0500 Subject: [PATCH 4/5] pin to older tinytex version --- .ci/test_r_package_windows.ps1 | 2 +- .github/workflows/r_package.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index c93db3b27011..315b16f92151 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -88,7 +88,7 @@ if ($env:R_MAJOR_VERSION -eq "3") { $env:R_LIB_PATH = "$env:BUILD_SOURCESDIRECTORY/RLibrary" -replace '[\\]', '/' $env:R_LIBS = "$env:R_LIB_PATH" -$env:PATH = "$env:RTOOLS_BIN;" + "$env:RTOOLS_MINGW_BIN;" + "$env:R_LIB_PATH/R/bin/x64;" + "C:\TinyTex\bin\win32;" + "C:\TinyTex\bin\windows;" + $env:PATH +$env:PATH = "$env:RTOOLS_BIN;" + "$env:RTOOLS_MINGW_BIN;" + "$env:R_LIB_PATH/R/bin/x64;" + $env:PATH $env:CRAN_MIRROR = "https://cran.rstudio.com" $env:MIKTEX_EXCEPTION_PATH = "$env:TEMP\miktex" diff --git a/.github/workflows/r_package.yml b/.github/workflows/r_package.yml index 62ebc86726a6..c0c72bc9dd32 100644 --- a/.github/workflows/r_package.yml +++ b/.github/workflows/r_package.yml @@ -197,6 +197,9 @@ jobs: env: CTAN_MIRROR: https://ctan.math.illinois.edu/systems/win32/miktex TINYTEX_INSTALLER: TinyTeX + # pinning to an old version to address breaking changes to paths not being available yet + # (ref: https://github.com/r-lib/actions/issues/713#issuecomment-1481293175) + TINYTEX_VERSION: '2023.03' - name: Setup and run tests on Linux and macOS if: matrix.os == 'macOS-latest' || matrix.os == 'ubuntu-latest' shell: bash From 6bdd9b37070515304cd959843a902330fd47c65d Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 26 Mar 2023 01:10:56 -0500 Subject: [PATCH 5/5] Update .ci/test_r_package_windows.ps1 --- .ci/test_r_package_windows.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index 315b16f92151..e4d20de50b90 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -88,7 +88,7 @@ if ($env:R_MAJOR_VERSION -eq "3") { $env:R_LIB_PATH = "$env:BUILD_SOURCESDIRECTORY/RLibrary" -replace '[\\]', '/' $env:R_LIBS = "$env:R_LIB_PATH" -$env:PATH = "$env:RTOOLS_BIN;" + "$env:RTOOLS_MINGW_BIN;" + "$env:R_LIB_PATH/R/bin/x64;" + $env:PATH +$env:PATH = "$env:RTOOLS_BIN;" + "$env:RTOOLS_MINGW_BIN;" + "$env:R_LIB_PATH/R/bin/x64;"+ $env:PATH $env:CRAN_MIRROR = "https://cran.rstudio.com" $env:MIKTEX_EXCEPTION_PATH = "$env:TEMP\miktex"