External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

Allow customizing npm path

Browse Source 
So jenkins can use `npm --no-color`
This commit is contained in:
James Laska
2015-09-10 19:03:41 -04:00
parent 3f9dd3ab22
commit 32cf468059
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -5,6 +5,7 @@ PACKER ?= packer
GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color") GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color")
BROCCOLI ?= ./node_modules/.bin/broccoli BROCCOLI ?= ./node_modules/.bin/broccoli
NODE ?= node NODE ?= node
NPM_BIN ?= npm
DEPS_SCRIPT ?= packaging/bundle/deps.py DEPS_SCRIPT ?= packaging/bundle/deps.py
AW_REPO_URL ?= "http://releases.ansible.com/ansible-tower" AW_REPO_URL ?= "http://releases.ansible.com/ansible-tower"
@@ -193,7 +194,7 @@ real-requirements_dev:
# Install third-party requirements needed for running unittests in jenkins # Install third-party requirements needed for running unittests in jenkins
real-requirements_jenkins: real-requirements_jenkins:
pip install -r requirements/requirements_jenkins.txt pip install -r requirements/requirements_jenkins.txt
npm install csslint jshint $(NPM_BIN) install csslint jshint
# "Install" ansible-tower package in development mode. # "Install" ansible-tower package in development mode.
develop: develop:
@@ -345,7 +346,7 @@ sync_ui: node_modules Brocfile.js
# Update local npm install # Update local npm install
node_modules: package.json node_modules: package.json
npm install $(NPM_BIN) install
touch $@ touch $@
devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js