Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4c6fbd1e4c |
|||
|
ac5a842081 |
1 changed files with 7 additions and 1 deletions
|
|
@ -16,6 +16,9 @@ ARG CACHEBUST
|
|||
|
||||
WORKDIR /work
|
||||
COPY build-one.R /work/build-one.R
|
||||
# Ship the patch registry so build-one.R's `patches = "local/patches"` resolves
|
||||
# (build context is `local/`, CWD is /work).
|
||||
COPY patches /work/local/patches
|
||||
|
||||
RUN --mount=type=secret,id=b2_access,required=true \
|
||||
--mount=type=secret,id=b2_secret,required=true \
|
||||
|
|
@ -27,6 +30,9 @@ RUN --mount=type=secret,id=b2_access,required=true \
|
|||
export GITHUB_PAT="$(cat /run/secrets/github_pat 2>/dev/null || true)" && \
|
||||
export GIT_TERMINAL_PROMPT=0 && \
|
||||
export OTEL_SDK_DISABLED=true && \
|
||||
export OTEL_R_TRACES_EXPORTER=none && \
|
||||
export OTEL_R_LOGS_EXPORTER=none && \
|
||||
export OTEL_R_METRICS_EXPORTER=none && \
|
||||
XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run || true); \
|
||||
XVFB_ARGS=""; \
|
||||
if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi; \
|
||||
|
|
@ -37,7 +43,7 @@ RUN --mount=type=secret,id=b2_access,required=true \
|
|||
echo "No working virtual display; building without xvfb" >&2; \
|
||||
fi; \
|
||||
run_build() { if [ "$USE_XVFB" = 1 ]; then $XVFB -a $XVFB_ARGS -- "$@"; else "$@"; fi; }; \
|
||||
ensure_bincraft() { "$1" -q -e 'if (!requireNamespace("bincraft", quietly = TRUE) || packageVersion("bincraft") != "4.2.1") pak::pak("git::https://codefloe.com/rpkgs/bincraft.git@v4.2.1")'; }; \
|
||||
ensure_bincraft() { "$1" -q -e 'if (!requireNamespace("bincraft", quietly = TRUE) || packageVersion("bincraft") != "4.4.0") pak::pak("git::https://codefloe.com/rpkgs/bincraft.git@v4.4.0")'; }; \
|
||||
PRIMARY_MINOR=$(echo "$R_VERSION" | cut -d. -f1-2); \
|
||||
seen=" $PRIMARY_MINOR "; \
|
||||
prc=0; failed=""; \
|
||||
|
|
|
|||
Loading…
Reference in a new issue