Skip to content

Commit 5ed3999

Browse files
committed
Revert
1 parent 75ee6d3 commit 5ed3999

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
config:
21-
- {os: macOS-latest, r: 'devel', miniconda: 'miniconda/'}
22-
- {os: macOS-latest, r: 'release', miniconda: 'miniconda/'}
21+
- {os: macOS-latest, r: 'devel'}
22+
- {os: macOS-latest, r: 'release'}
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"}
@@ -30,7 +30,6 @@ jobs:
3030
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
3131
RSPM: ${{ matrix.config.rspm }}
3232
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
33-
RETICULATE_MINICONDA_PATH: ${{ matrix.config.miniconda }}
3433

3534
steps:
3635
- uses: actions/checkout@v2
@@ -71,21 +70,21 @@ jobs:
7170
remotes::install_cran("rcmdcheck")
7271
shell: Rscript {0}
7372

74-
- name: Install TensorFlow on macOS
75-
if: runner.os == 'macOS'
73+
- name: Install TensorFlow on macOS and Ubuntu
74+
if: runner.os != 'Windows'
75+
env:
76+
RETICULATE_MINICONDA_PATH: 'miniconda/'
7677
run: |
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}
78+
Rscript -e "reticulate::install_miniconda()"
79+
Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.9', conda = 'miniconda/bin/conda')"
80+
Rscript -e "tensorflow::install_tensorflow(version='1.14.0', conda = 'miniconda/bin/conda')"
8181
82-
- name: Install TensorFlow on Ubuntu and Windows
83-
if: runner.os != 'macOS'
82+
- name: Install TensorFlow on Windows
83+
if: runner.os == 'Windows'
8484
run: |
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}
85+
Rscript -e "reticulate::install_miniconda()"
86+
Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.9')"
87+
Rscript -e "tensorflow::install_tensorflow(version='1.14.0')"
8988
9089
- name: Session info
9190
run: |

0 commit comments

Comments
 (0)