Skip to content

Commit 2efb0f1

Browse files
authored
fix: allow failure of building linux native binary (#5)
* Revert "Do not update nightly" This reverts commit 32f307f. * Revert "Update rust regularly" This reverts commit e883cb0. * fix: allow failure of building linux native binary
1 parent 1432860 commit 2efb0f1

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

.github/workflows/build.yml

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

119
jobs:
1210
build:

Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ 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+
1820
# equivs-control libnode-dev && \
1921
# sed -i 's/Package:.*/Package: libnode-dev/' libnode-dev && \
2022
# sed -i 's/# Provides:.*/Provides: libv8-dev/' libnode-dev && \
@@ -40,12 +42,6 @@ ENV R_LIBS_USER=/opt/R/current/lib/R/site-library
4042
COPY Renviron /opt/R/current/lib/R/etc/Renviron.site
4143
COPY Rprofile /opt/R/current/lib/R/etc/Rprofile.site
4244

43-
# Update emscripten rust from the parent container
44-
RUN rustup update stable
45-
46-
# Workaround for https://github.com/rust-lang/rustup/issues/2417
47-
## RUN rustup toolchain uninstall nightly && rustup toolchain install nightly
48-
4945
# Use devel-pak (until solver hangs are fixed)
5046
RUN R -e 'install.packages("pak", lib = .Library, repos = "https://r-lib.github.io/p/pak/devel/source/linux-gnu/x86_64")'
5147

entrypoint.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ 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 || true
17-
echo "::endgroup::"
18-
fi
19-
2013
# Use package cache dir
2114
export R_LIBS_USER="${PWD}/pkglib"
2215

0 commit comments

Comments
 (0)