Skip to content

Commit

Permalink
Don't always install node in the virtualenv
Browse files Browse the repository at this point in the history
if it's already installed system-wide at the correct version.

Prevent node installation issues during CI builds where we install
node with the setup-node action but it was ignored because it was
not inside the virtualenv, e.g.:

https://github.com/galaxyproject/galaxy/actions/runs/5530959878/jobs/10091018774
  • Loading branch information
nsoranzo committed Jul 12, 2023
1 parent eb36c37 commit 6249746
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/common_startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ fi

# Install node if not installed
if [ -n "$VIRTUAL_ENV" ]; then
if ! in_venv "$(command -v node)" || [ "$(node --version)" != "v${NODE_VERSION}" ]; then
if ! command -v node >/dev/null || [ "$(node --version)" != "v${NODE_VERSION}" ]; then
echo "Installing node into $VIRTUAL_ENV with nodeenv."
if [ -d "${VIRTUAL_ENV}/lib/node_modules" ]; then
echo "Removing old ${VIRTUAL_ENV}/lib/node_modules directory."
Expand Down

0 comments on commit 6249746

Please sign in to comment.