Skip to content

Commit 259749f

Browse files
authored
Merge pull request #337 from tidymodels/update-gh-actions
Add MacOS testing back to parsnip
2 parents 0bcc6dd + bc2fd34 commit 259749f

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
config:
18-
- { os: windows-latest, r: '3.6'}
19-
- { os: windows-latest, r: '4.0'}
20-
- { os: windows-latest, r: 'devel'}
21-
- { os: ubuntu-16.04, r: '3.5', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
22-
- { os: ubuntu-16.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
18+
- {os: macOS-latest, r: 'devel'}
19+
- {os: macOS-latest, r: 'release'}
20+
- {os: windows-latest, r: 'release'}
21+
- {os: windows-latest, r: '3.6'}
22+
- {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
23+
- {os: ubuntu-16.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
24+
- {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
2325

2426
env:
2527
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -65,11 +67,20 @@ jobs:
6567
remotes::install_cran("rcmdcheck")
6668
shell: Rscript {0}
6769

68-
- name: Install TensorFlow
70+
- name: Install Miniconda
6971
run: |
72+
Rscript -e "remotes::install_github('rstudio/reticulate')"
7073
Rscript -e "reticulate::install_miniconda()"
71-
Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.9')"
72-
Rscript -e "tensorflow::install_tensorflow(version='1.14.0')"
74+
75+
- name: Find Miniconda on macOS
76+
if: runner.os == 'macOS'
77+
run: echo "options(reticulate.conda_binary = reticulate:::miniconda_conda())" >> .Rprofile
78+
79+
- name: Install TensorFlow
80+
run: |
81+
reticulate::conda_create('r-reticulate', packages = c('python==3.6.9'))
82+
tensorflow::install_tensorflow(version='1.14.0')
83+
shell: Rscript {0}
7384

7485
- name: Session info
7586
run: |

.github/workflows/test-coverage.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ jobs:
4343

4444
- name: Install TensorFlow
4545
run: |
46+
Rscript -e "remotes::install_github('rstudio/reticulate')"
4647
Rscript -e "reticulate::install_miniconda()"
48+
echo "options(reticulate.conda_binary = reticulate:::miniconda_conda())" >> .Rprofile
4749
Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.9')"
4850
Rscript -e "tensorflow::install_tensorflow(version='1.14.0')"
4951

0 commit comments

Comments
 (0)