File tree Expand file tree Collapse file tree 3 files changed +30
-3
lines changed Expand file tree Collapse file tree 3 files changed +30
-3
lines changed Original file line number Diff line number Diff line change @@ -182,6 +182,7 @@ jobs:
182182 push : true
183183 build-args : |
184184 WEBRCI_SHA=${{ steps.short.outputs.sha }}
185+ MAKE_LIBS_TARGET=all
185186 tags : ${{ steps.meta.outputs.tags }}
186187 labels : ${{ steps.meta.outputs.labels }}
187188 build-nix :
Original file line number Diff line number Diff line change 77 workflow_dispatch :
88
99jobs :
10- build-docker :
10+ build-webr :
1111 runs-on : ubuntu-latest
1212 container : ghcr.io/r-wasm/flang-wasm:main
1313 steps :
4040 fail_ci_if_error : true
4141 verbose : true
4242 token : ${{ secrets.CC_TOKEN }}
43+ build-docker :
44+ runs-on : ubuntu-latest
45+ permissions :
46+ contents : read
47+ steps :
48+ - name : Checkout repository
49+ uses : actions/checkout@v4
50+ - name : Short commit SHA
51+ id : short
52+ run : |
53+ SHA="${{github.event.pull_request.head.sha}}${{ github.sha }}"
54+ SHORT_SHA=${SHA:0:7}
55+ echo "sha: $SHORT_SHA"
56+ echo "sha=$SHORT_SHA" >> $GITHUB_OUTPUT
57+ - name : Build Docker image
58+ uses : docker/build-push-action@v5
59+ with :
60+ context : .
61+ push : false
62+ build-args : |
63+ WEBRCI_SHA=${{ steps.short.outputs.sha }}
64+ MAKE_LIBS_TARGET=default
4365 build-nix :
4466 runs-on : ubuntu-latest
4567 steps :
Original file line number Diff line number Diff line change @@ -66,7 +66,10 @@ RUN curl -L https://rig.r-pkg.org/deb/rig.gpg -o /etc/apt/trusted.gpg.d/rig.gpg
6666
6767# Because $HOME gets masked by GHA with the host $HOME
6868ENV R_LIBS_USER=/opt/R/current/lib/R/site-library
69- RUN rig add 4.4.0
69+ # Don't install pak. Rig installs it into the user lib, but we want it in the system lib
70+ RUN rig add 4.4.0 --without-pak
71+ # Install pak into the system lib
72+ RUN /opt/R/current/bin/R -q -e 'install.packages("pak", lib = .Library)'
7073
7174# Download webR and configure for LLVM flang
7275RUN git clone https://github.com/r-wasm/webr.git /opt/webr
@@ -79,7 +82,8 @@ RUN ./configure
7982RUN R CMD INSTALL packages/webr
8083
8184# Build webR with supporting Wasm libs
82- RUN cd libs && make all
85+ ARG MAKE_LIBS_TARGET="all"
86+ RUN cd libs && make ${MAKE_LIBS_TARGET}
8387RUN make
8488
8589# Cleanup
You can’t perform that action at this time.
0 commit comments