Skip to content

Commit 3d8596c

Browse files
committed
Update readme w/ working config
1 parent 2f818e7 commit 3d8596c

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,19 @@ jobs:
180180
with:
181181
packages: "."
182182
repo-path: "_site"
183-
webr-image: "ghcr.io/r-wasm/webr:v0.3.3" # fixed version for now
184-
183+
webr-image: "ghcr.io/r-wasm/webr:v0.4.2" # fixed version for now
184+
185185
# Upload the CRAN repository for use in the next step
186186
# Make sure to set a retention day to avoid running into a cap
187187
- name: Upload build artifact
188-
uses: actions/upload-artifact@v3
188+
uses: actions/upload-artifact@v4
189189
with:
190190
name: rwasmrepo
191191
path: |
192192
_site
193193
retention-days: 1
194194
195+
195196
altdoc:
196197
runs-on: ubuntu-latest
197198
# Add a dependency on the prior job completing
@@ -228,28 +229,30 @@ jobs:
228229
install.packages(".", repos = NULL, type = "source")
229230
install.packages("pkgload")
230231
pkgload::load_all()
231-
altdoc::render_docs(parallel = FALSE, freeze = FALSE)
232+
altdoc::render_docs(verbose = TRUE, parallel = FALSE, freeze = FALSE)
232233
shell: Rscript {0}
233234
234235
- name: Copy to new directory
235236
run: |
236-
cp -r docs _site
237-
237+
mkdir -p _site
238+
cp -r *quarto/*site/* _site/
239+
238240
# New material ---
239241
240242
# Download the built R WASM CRAN repository from the prior step.
241243
# Extract it into the `_site` directory
242244
- name: Download build artifact
243-
uses: actions/download-artifact@v3
245+
uses: actions/download-artifact@v4
244246
with:
245247
name: rwasmrepo
246248
path: _site
249+
merge-multiple: true
247250

248251
# Upload a tar file that will work with GitHub Pages
249252
# Make sure to set a retention day to avoid running into a cap
250253
# This artifact shouldn't be required after deployment onto pages was a success.
251254
- name: Upload Pages artifact
252-
uses: actions/upload-pages-artifact@v2
255+
uses: actions/upload-pages-artifact@v3
253256
with:
254257
retention-days: 1
255258

@@ -258,7 +261,7 @@ jobs:
258261
# instead of using `docs/` or the `gh-pages` branch of the repository
259262
- name: Deploy to GitHub Pages
260263
id: deployment
261-
uses: actions/deploy-pages@v2
264+
uses: actions/deploy-pages@v4
262265
```
263266
264267
You can view the full workflow file here:
@@ -268,7 +271,7 @@ You can view the full workflow file here:
268271
> [!IMPORTANT]
269272
>
270273
> We’ve fixed the version of webR being used to generate the R WASM
271-
> binaries to `v0.3.3` for the `webr-image` in the `rwasmbuild` job.
274+
> binaries to `v0.4.2` for the `webr-image` in the `rwasmbuild` job.
272275
> This is to ensure that a released/tagged version of webR is used
273276
> instead of depending on the latest release, e.g. `latest` tag.
274277

README.qmd

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,18 +158,19 @@ jobs:
158158
with:
159159
packages: "."
160160
repo-path: "_site"
161-
webr-image: "ghcr.io/r-wasm/webr:v0.3.3" # fixed version for now
162-
161+
webr-image: "ghcr.io/r-wasm/webr:v0.4.2" # fixed version for now
162+
163163
# Upload the CRAN repository for use in the next step
164164
# Make sure to set a retention day to avoid running into a cap
165165
- name: Upload build artifact
166-
uses: actions/upload-artifact@v3
166+
uses: actions/upload-artifact@v4
167167
with:
168168
name: rwasmrepo
169169
path: |
170170
_site
171171
retention-days: 1
172172
173+
173174
altdoc:
174175
runs-on: ubuntu-latest
175176
# Add a dependency on the prior job completing
@@ -206,28 +207,30 @@ jobs:
206207
install.packages(".", repos = NULL, type = "source")
207208
install.packages("pkgload")
208209
pkgload::load_all()
209-
altdoc::render_docs(parallel = FALSE, freeze = FALSE)
210+
altdoc::render_docs(verbose = TRUE, parallel = FALSE, freeze = FALSE)
210211
shell: Rscript {0}
211212
212213
- name: Copy to new directory
213214
run: |
214-
cp -r docs _site
215-
215+
mkdir -p _site
216+
cp -r *quarto/*site/* _site/
217+
216218
# New material ---
217219
218220
# Download the built R WASM CRAN repository from the prior step.
219221
# Extract it into the `_site` directory
220222
- name: Download build artifact
221-
uses: actions/download-artifact@v3
223+
uses: actions/download-artifact@v4
222224
with:
223225
name: rwasmrepo
224226
path: _site
227+
merge-multiple: true
225228

226229
# Upload a tar file that will work with GitHub Pages
227230
# Make sure to set a retention day to avoid running into a cap
228231
# This artifact shouldn't be required after deployment onto pages was a success.
229232
- name: Upload Pages artifact
230-
uses: actions/upload-pages-artifact@v2
233+
uses: actions/upload-pages-artifact@v3
231234
with:
232235
retention-days: 1
233236

@@ -236,7 +239,7 @@ jobs:
236239
# instead of using `docs/` or the `gh-pages` branch of the repository
237240
- name: Deploy to GitHub Pages
238241
id: deployment
239-
uses: actions/deploy-pages@v2
242+
uses: actions/deploy-pages@v4
240243
```
241244
242245
You can view the full workflow file here:
@@ -245,7 +248,7 @@ You can view the full workflow file here:
245248
246249
:::{.callout-important}
247250
We've fixed the version of webR being used to generate the R WASM binaries
248-
to `v0.3.3` for the `webr-image` in the `rwasmbuild` job. This is to
251+
to `v0.4.2` for the `webr-image` in the `rwasmbuild` job. This is to
249252
ensure that a released/tagged version of webR is used instead of depending
250253
on the latest release, e.g. `latest` tag.
251254
:::

0 commit comments

Comments
 (0)