Skip to content

Commit 82832bc

Browse files
committedMar 7, 2025·
Restore retrofit
1 parent 1364c41 commit 82832bc

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed
 

‎.ci/write-dockerfile.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,14 @@ ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!
349349
$ADD .gitignore /new/.gitignore
350350
$ADD src /new/src
351351
RUN cd /new && rm -rf .git && \\
352-
rm -rf /sage/src; \\
353-
mv src /sage/src; \\
354-
cd /sage && ./bootstrap && ./config.status; \\
352+
if /.ci/retrofit-worktree.sh worktree-pre /sage; then \\
353+
cd /sage && touch configure build/make/Makefile; \\
354+
else \\
355+
echo "retrofit-worktree.sh failed, falling back to replacing /sage/src"; \\
356+
rm -rf /sage/src; \\
357+
mv src /sage/src; \\
358+
cd /sage && ./bootstrap && ./config.status; \\
359+
fi; \\
355360
cd /sage && rm -rf .git; rm -rf /new || echo "(error ignored)"
356361
ARG TARGETS="build"
357362
$RUN$CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS}$ENDRUN$THEN_SAVE_STATUS

0 commit comments

Comments
 (0)