Skip to content

Commit dbb0afc

Browse files
committed
Put Miniconda path into config matrix
1 parent ed046f5 commit dbb0afc

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
config:
21-
- {os: macOS-latest, r: 'devel'}
22-
- {os: macOS-latest, r: 'release'}
21+
- {os: macOS-latest, r: 'devel', miniconda: '../miniconda/'}
22+
- {os: macOS-latest, r: 'release', miniconda: '../miniconda/'}
2323
- {os: windows-latest, r: 'release'}
2424
- {os: windows-latest, r: '3.6'}
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 }}
33+
RETICULATE_MINICONDA_PATH: ${{ matrix.config.miniconda }}
3734

3835
steps:
3936
- uses: actions/checkout@v2
@@ -77,16 +74,18 @@ jobs:
7774
- name: Install TensorFlow on macOS
7875
if: runner.os == 'macOS'
7976
run: |
80-
Rscript -e "reticulate::install_miniconda()"
81-
Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.9', conda = '../miniconda/bin/conda')"
82-
Rscript -e "tensorflow::install_tensorflow(version='1.14.0', conda = '../miniconda/bin/conda')"
77+
reticulate::install_miniconda()
78+
reticulate::conda_create('r-reticulate', packages = 'python==3.6.9', conda = '../miniconda/bin/conda')
79+
tensorflow::install_tensorflow(version='1.14.0', conda = '../miniconda/bin/conda')
80+
shell: Rscript {0}
8381

8482
- name: Install TensorFlow on Windows and Ubuntu
8583
if: runner.os != 'macOS'
8684
run: |
87-
Rscript -e "reticulate::install_miniconda()"
88-
Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.9')"
89-
Rscript -e "tensorflow::install_tensorflow(version='1.14.0')"
85+
reticulate::install_miniconda()
86+
reticulate::conda_create('r-reticulate', packages = 'python==3.6.9')
87+
tensorflow::install_tensorflow(version='1.14.0')
88+
shell: Rscript {0}
9089

9190
- name: Session info
9291
run: |

0 commit comments

Comments
 (0)