From bbc0c1230b14aaa32121aad45254e4bc4ba6f887 Mon Sep 17 00:00:00 2001 From: Vitaly Kramskikh Date: Sat, 21 Mar 2015 00:47:37 +0300 Subject: [PATCH] Replace Grunt with Gulp (fuel-main part) Implements blueprint move-to-gulp Change-Id: If15610a6a4043b3bf91aadb4e99b929abc4e4ffb --- packages/module.mk | 2 +- prepare-build-env.sh | 2 +- utils/jenkins/fuelweb_fakeui.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/module.mk b/packages/module.mk index 56011a9cb..77f613453 100644 --- a/packages/module.mk +++ b/packages/module.mk @@ -25,7 +25,7 @@ $(BUILD_DIR)/packages/sources/$1/$2: $(call find-files,$3) mkdir -p $(BUILD_DIR)/packages/sources/$1 ifeq ($1,nailgun) mkdir -p $(BUILD_DIR)/npm-cache - cd $3 && npm --cache $(BUILD_DIR)/npm-cache install && grunt build --static-dir=compressed_static + cd $3 && npm --cache $(BUILD_DIR)/npm-cache install && ./node_modules/.bin/gulp build --static-dir=compressed_static rm -rf $3/static mv $3/compressed_static $3/static endif diff --git a/prepare-build-env.sh b/prepare-build-env.sh index df55acb31..10f921481 100755 --- a/prepare-build-env.sh +++ b/prepare-build-env.sh @@ -115,7 +115,7 @@ sudo apt-get -y install build-essential make git $GEMPKG debootstrap createrepo sudo gem install bundler -v 1.2.1 sudo gem install builder sudo pip install xmlbuilder jinja2 pbr -sudo npm install -g grunt-cli +sudo npm install -g gulp sudo chown -R `whoami`.`id -gn` `npm config get cache` # Add account to sudoers diff --git a/utils/jenkins/fuelweb_fakeui.sh b/utils/jenkins/fuelweb_fakeui.sh index e1402bdfb..e3f287b92 100755 --- a/utils/jenkins/fuelweb_fakeui.sh +++ b/utils/jenkins/fuelweb_fakeui.sh @@ -25,7 +25,7 @@ npm install ./manage.py loaddata nailgun/fixtures/sample_environment.json # Compressing javascript -grunt build --static-dir=static_compressed +./node_modules/.bin/gulp build --static-dir=static_compressed # Replace static path with the one pointing to compressed static content folder STATIC_DIR=$WORKSPACE/build/repos/nailgun/nailgun/static_compressed