mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Build: remove redundant webpack step in makefile
Removes the webpack make target and the 'webpack' call from client target. The webpack production build step is already called from the `grunt` step.
This commit is contained in:
@@ -63,10 +63,7 @@ grunt: npm-deps ## Calls out to Grunt to build client
|
||||
style: npm-deps ## Calls the style task of Grunt
|
||||
cd client && node_modules/grunt-cli/bin/grunt style
|
||||
|
||||
webpack: npm-deps ## Pack javascript
|
||||
cd client && node_modules/webpack/bin/webpack.js -p
|
||||
|
||||
client: grunt style webpack ## Rebuild all client-side artifacts
|
||||
client: grunt style ## Rebuild all client-side artifacts
|
||||
|
||||
grunt-docker-image: ## Build docker image for running grunt
|
||||
docker build -t ${GRUNT_DOCKER_NAME} client
|
||||
@@ -79,7 +76,7 @@ clean-grunt-docker-image: ## Remove grunt docker image
|
||||
|
||||
|
||||
# Release Targets
|
||||
release-create-rc: release-ensure-upstream ## Create a release-candidate branch
|
||||
release-create-rc: release-ensure-upstream ## Create a release-candidate branch
|
||||
git checkout dev
|
||||
git pull --ff-only $(RELEASE_UPSTREAM) dev
|
||||
git push origin dev
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user