Skip to content

Commit c8b3ac1

Browse files
committed
Add separate step for reticulate to prefer the Miniconda environment
1 parent 2198fab commit c8b3ac1

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,11 @@ jobs:
2525
- {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
2626
- {os: ubuntu-16.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
2727
- {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
28-
include:
29-
- os: macOS-latest
30-
miniconda: '../miniconda/'
3128

3229
env:
3330
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
3431
RSPM: ${{ matrix.config.rspm }}
3532
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
36-
RETICULATE_MINICONDA_PATH: ${{ matrix.miniconda }}
3733

3834
steps:
3935
- uses: actions/checkout@v2
@@ -74,19 +70,18 @@ jobs:
7470
remotes::install_cran("rcmdcheck")
7571
shell: Rscript {0}
7672

77-
- name: Install TensorFlow on macOS
78-
if: runner.os == 'macOS'
73+
- name: Install Miniconda
7974
run: |
80-
reticulate::install_miniconda()
81-
reticulate::conda_create('r-reticulate', packages = 'python==3.6.9', conda = '../miniconda/bin/conda')
82-
tensorflow::install_tensorflow(version='1.14.0', conda = '../miniconda/bin/conda')
83-
shell: Rscript {0}
75+
Rscript -e "remotes::install_github('rstudio/reticulate')"
76+
Rscript -e "reticulate::install_miniconda()"
77+
78+
- name: Find Miniconda on macOS
79+
if: runner.os == 'macOS'
80+
run: echo "options(reticulate.conda_binary = reticulate:::miniconda_conda())" >> .Rprofile
8481

85-
- name: Install TensorFlow on Windows and Ubuntu
86-
if: runner.os != 'macOS'
82+
- name: Install TensorFlow
8783
run: |
88-
reticulate::install_miniconda()
89-
reticulate::conda_create('r-reticulate', packages = 'python==3.6.9')
84+
reticulate::conda_create('r-reticulate', packages = c('python==3.6.9'))
9085
tensorflow::install_tensorflow(version='1.14.0')
9186
shell: Rscript {0}
9287

0 commit comments

Comments
 (0)