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:
182
182
push : true
183
183
build-args : |
184
184
WEBRCI_SHA=${{ steps.short.outputs.sha }}
185
+ MAKE_LIBS_TARGET=all
185
186
tags : ${{ steps.meta.outputs.tags }}
186
187
labels : ${{ steps.meta.outputs.labels }}
187
188
build-nix :
Original file line number Diff line number Diff line change 7
7
workflow_dispatch :
8
8
9
9
jobs :
10
- build-docker :
10
+ build-webr :
11
11
runs-on : ubuntu-latest
12
12
container : ghcr.io/r-wasm/flang-wasm:main
13
13
steps :
40
40
fail_ci_if_error : true
41
41
verbose : true
42
42
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
43
65
build-nix :
44
66
runs-on : ubuntu-latest
45
67
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
66
66
67
67
# Because $HOME gets masked by GHA with the host $HOME
68
68
ENV 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)'
70
73
71
74
# Download webR and configure for LLVM flang
72
75
RUN git clone https://github.com/r-wasm/webr.git /opt/webr
@@ -79,7 +82,8 @@ RUN ./configure
79
82
RUN R CMD INSTALL packages/webr
80
83
81
84
# 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}
83
87
RUN make
84
88
85
89
# Cleanup
You can’t perform that action at this time.
0 commit comments