Switch back to yarn

This commit is contained in:
squidfunk 2017-03-16 12:54:13 +01:00
parent cd64b7372a
commit 7485a2ec50
2 changed files with 9 additions and 9 deletions

View File

@ -38,22 +38,22 @@ git:
# Cache dependencies
cache:
pip: true
# yarn: true
yarn: true
directories:
- node_modules
# Install yarn as Travis doesn't support it out of the box
# before_install:
# - npm install -g yarn@v0.22.0
before_install:
- npm install -g yarn@v0.22.0
# Install dependencies
install:
- npm install --no-optional
- yarn install --ignore-optional
- pip install --user -r requirements.txt
# Perform build and tests
script:
- npm run build
- yarn run build
# -----------------------------------------------------------------------------
# Additional builds

View File

@ -20,12 +20,12 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
# Check if "npm install" was executed
if [[ ! -d "$(npm bin)" ]]; then
# Check if "yarn install" was executed
if [[ ! -d "$(yarn bin)" ]]; then
echo "\"node_modules\" not found:"
echo "npm install"
echo "yarn install"
exit 1
fi
# Run command
"$(npm bin)"/gulp build --clean --optimize --revision "$@"
"$(yarn bin)"/gulp build --clean --optimize --revision "$@"