Browse code

updated GHA

Robert Ivánek authored on 11/01/2021 11:07:26
Showing 1 changed files

... ...
@@ -133,8 +133,8 @@ jobs:
133 133
           ## For textshaping, required by ragg, and required by pkgdown
134 134
           brew install harfbuzz fribidi
135 135
 
136
-          ## Helps compile RCurl from source
137
-          brew uninstall curl
136
+          ## For installing usethis's dependency gert
137
+          brew install libgit2
138 138
 
139 139
       - name: Install Windows system dependencies
140 140
         if: runner.os == 'Windows'
... ...
@@ -153,7 +153,7 @@ jobs:
153 153
           BiocManager::install(version = "${{ matrix.config.bioc }}", ask = FALSE)
154 154
         shell: Rscript {0}
155 155
 
156
-      - name: Install dependencies
156
+      - name: Install dependencies pass 1
157 157
         run: |
158 158
           ## Try installing the package dependencies in steps. First the local
159 159
           ## dependencies, then any remaining dependencies to avoid the
... ...
@@ -162,22 +162,18 @@ jobs:
162 162
           ## https://github.com/r-lib/remotes/issues/296
163 163
           ## Ideally, all dependencies should get installed in the first pass.
164 164
 
165
-          ## Temporary for now due to https://github.com/ropensci/RefManageR/issues/79
166
-          remotes::install_github("ropensci/bibtex")
167
-          remotes::install_github("ropensci/RefManageR")
168
-          remotes::install_github("cboettig/knitcitations")
169
-          
170
-          ## install additionall RCurl
171
-          remotes::install_cran("RCurl")
172
-          
173 165
           ## Pass #1 at installing dependencies
174 166
           message(paste('****', Sys.time(), 'pass number 1 at installing dependencies: local dependencies ****'))
175 167
           remotes::install_local(dependencies = TRUE, repos = BiocManager::repositories(), build_vignettes = TRUE, upgrade = TRUE)
168
+        continue-on-error: true
169
+        shell: Rscript {0}
176 170
 
171
+      - name: Install dependencies pass 2
172
+        run: |
177 173
           ## Pass #2 at installing dependencies
178 174
           message(paste('****', Sys.time(), 'pass number 2 at installing dependencies: any remaining dependencies ****'))
179 175
           remotes::install_local(dependencies = TRUE, repos = BiocManager::repositories(), build_vignettes = TRUE, upgrade = TRUE)
180
-
176
+          
181 177
           ## For running the checks
182 178
           message(paste('****', Sys.time(), 'installing rcmdcheck and BiocCheck ****'))
183 179
           remotes::install_cran("rcmdcheck")
... ...
@@ -200,7 +196,7 @@ jobs:
200 196
       - name: Install pkgdown
201 197
         if: github.ref == 'refs/heads/master' && env.run_pkgdown == 'true' && runner.os == 'Linux'
202 198
         run: |
203
-          remotes::install_github("r-lib/pkgdown")
199
+          remotes::install_cran("pkgdown")
204 200
         shell: Rscript {0}
205 201
 
206 202
       - name: Session info