Skip to content

Force makefile client targets to use .venv-shipped node if it exists #16462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvdbeek merged 3 commits into from
Jul 26, 2023
Merged

Force makefile client targets to use .venv-shipped node if it exists #16462

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98aefd9
Force makefile client targets to use .venv-shipped node
dannon Jul 25, 2023
a3e29e5
Use venv (when available) for yarn availability check
dannon Jul 25, 2023
b9de074
Dedupe no-yarn-message, tweak to mention .venv
dannon Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ ifndef YARN
@echo "Could not find yarn, which is required to build the Galaxy client.\nTo install yarn, please visit \033[0;34mhttps://yarnpkg.com/en/docs/install\033[0m for instructions, and package information for all platforms.\n"
Comment thread
dannon marked this conversation as resolved.
Outdated
false;
else
cd client && yarn install $(YARN_INSTALL_OPTS)
$(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS)
endif


Expand All @@ -198,39 +198,39 @@ update-navigation-schema: client-node-deps
$(IN_VENV) cd client && node navigation_to_schema.mjs

install-client: node-deps ## Install prebuilt client as defined in root package.json
yarn install && yarn run stage
$(IN_VENV) yarn install && yarn run stage

client: client-node-deps ## Rebuild client-side artifacts for local development.
cd client && $(NODE_ENV) yarn run build
$(IN_VENV) cd client && $(NODE_ENV) yarn run build

client-production: client-node-deps ## Rebuild client-side artifacts for a production deployment without sourcemaps.
cd client && $(NODE_ENV) yarn run build-production
$(IN_VENV) cd client && $(NODE_ENV) yarn run build-production

client-production-maps: client-node-deps ## Rebuild client-side artifacts for a production deployment with sourcemaps.
cd client && $(NODE_ENV) yarn run build-production-maps
$(IN_VENV) cd client && $(NODE_ENV) yarn run build-production-maps

client-format: client-node-deps ## Reformat client code
cd client && yarn run format
$(IN_VENV) cd client && yarn run format

client-dev-server: client-node-deps ## Starts a webpack dev server for client development (HMR enabled)
cd client && $(NODE_ENV) yarn run develop
$(IN_VENV) cd client && $(NODE_ENV) yarn run develop

client-test: client-node-deps ## Run JS unit tests
cd client && yarn run test
$(IN_VENV) cd client && yarn run test

client-eslint-precommit: client-node-deps # Client linting for pre-commit hook; skips glob input and takes specific paths
cd client && yarn run eslint-precommit
$(IN_VENV) cd client && yarn run eslint-precommit

client-eslint: client-node-deps # Run client linting
cd client && yarn run eslint
$(IN_VENV) cd client && yarn run eslint

client-format-check: client-node-deps # Run client formatting check
cd client && yarn run format-check
$(IN_VENV) cd client && yarn run format-check

client-lint: client-eslint client-format-check ## ES lint and check format of client

client-test-watch: client ## Watch and run all client unit tests on changes
cd client && yarn run jest-watch
$(IN_VENV) cd client && yarn run jest-watch

serve-selenium-notebooks: ## Serve testing notebooks for Jupyter
cd lib && export PYTHONPATH=`pwd`; jupyter notebook --notebook-dir=galaxy_test/selenium/jupyter
Expand Down