Skip to content

Commit 5fdd9b9

Browse files
committed
Update rust regularly
Closes #4
1 parent f55a9e1 commit 5fdd9b9

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches: [master]
66
workflow_dispatch:
77
branches: [master]
8+
schedule:
9+
- cron: "0 2 * * *"
810

911
jobs:
1012
build:

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ FROM ghcr.io/r-wasm/webr:main
1515
# Alternative workaround for libnode-dev conflicting with nodejs (see above)
1616
RUN apt-get update && \
1717
apt-get install -y equivs lsb-release
18-
19-
2018
# equivs-control libnode-dev && \
2119
# sed -i 's/Package:.*/Package: libnode-dev/' libnode-dev && \
2220
# sed -i 's/# Provides:.*/Provides: libv8-dev/' libnode-dev && \
@@ -42,6 +40,9 @@ ENV R_LIBS_USER=/opt/R/current/lib/R/site-library
4240
COPY Renviron /opt/R/current/lib/R/etc/Renviron.site
4341
COPY Rprofile /opt/R/current/lib/R/etc/Rprofile.site
4442

43+
# Update emscripten rust from the parent container
44+
RUN rustup update stable
45+
4546
# Use devel-pak (until solver hangs are fixed)
4647
RUN R -e 'install.packages("pak", lib = .Library, repos = "https://r-lib.github.io/p/pak/devel/source/linux-gnu/x86_64")'
4748

entrypoint.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ echo "Running fake X server on $DISPLAY"
1010
SOURCEPKG="${1:-$SOURCEPKG}"
1111
GITHUB_OUTPUT=${GITHUB_OUTPUT:-/dev/stdout}
1212

13+
# Make sure we have laste rust
14+
if [ "$NEED_CARGO" ]; then
15+
echo "::group::Update Rust"
16+
rustup update stable nightly
17+
echo "::endgroup::"
18+
fi
19+
1320
# Use package cache dir
1421
export R_LIBS_USER="${PWD}/pkglib"
1522

0 commit comments

Comments
 (0)