Skip to content

Commit a3c33c6

Browse files
committed
Move sysdeps down to prevent pak from hanging
1 parent 20c2236 commit a3c33c6

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

entrypoint.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ fi
4141
DESCRIPTION="${PKGDIR}/DESCRIPTION"
4242
sed '/^[[:space:]]*$/d' -i "${DESCRIPTION}" # deletes empty lines at end of DESCRIPTION
4343

44-
# Get system dependencies
45-
echo "::group::Installing system dependencies"
46-
Rscript --no-init-file -e "buildtools::install_sysdeps('$PKGDIR')"
47-
echo "::endgroup::"
48-
4944
# Experimental: support pkgs like rJava
5045
if test -f "$PKGDIR/bootstrap.R"; then
5146
echo "Trying to run $PKGDIR/bootstrap.R"
@@ -110,6 +105,12 @@ echo "::group::Installing R dependencies"
110105
Rscript --no-init-file -e "buildtools::install_dependencies('$PKGDIR')"
111106
echo "::endgroup::"
112107

108+
# Get system dependencies
109+
# We do this after installing dependencies to prevent pak from hanging
110+
echo "::group::Installing system dependencies"
111+
Rscript --no-init-file -e "buildtools::install_sysdeps('$PKGDIR')"
112+
echo "::endgroup::"
113+
113114
# These are set in install_dependencies() above
114115
if [ -f "/NEED_RJAVA" ]; then
115116
echo "NEED_RJAVA=true" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)