From dfe3d1321945845f5494a10fa65205f3973447d7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 2 Jan 2019 17:31:57 +0100 Subject: [PATCH 1/2] [ticket/15924] Use default travis node version PHPBB3-15924 --- travis/check-stylesheet.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/travis/check-stylesheet.sh b/travis/check-stylesheet.sh index 331f3f0c30..1953c65c2d 100755 --- a/travis/check-stylesheet.sh +++ b/travis/check-stylesheet.sh @@ -15,20 +15,6 @@ NOTESTS=$1 if [ "$NOTESTS" == '1' ] then - # Define a node version. - TRAVIS_NODE_VERSION="4" - - # Clear out whatever version of NVM Travis has. - # Their version of NVM is probably old. - rm -rf ~/.nvm - # Grab NVM. - git clone https://github.com/creationix/nvm.git ~/.nvm > /dev/null - # Checkout the latest stable tag. - # Note that you can just hardcode a preferred version here. - (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) - # Install the desired version of Node - source ~/.nvm/nvm.sh - nvm install $TRAVIS_NODE_VERSION > /dev/null npm install -g > /dev/null npm install > /dev/null set -x From b74ee356d2f74f7cd0ea33b7e2580106e177da17 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 2 Jan 2019 17:43:23 +0100 Subject: [PATCH 2/2] [ticket/15924] Try running stylelint via node_modules PHPBB3-15924 --- travis/check-stylesheet.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/check-stylesheet.sh b/travis/check-stylesheet.sh index 1953c65c2d..743b65db9b 100755 --- a/travis/check-stylesheet.sh +++ b/travis/check-stylesheet.sh @@ -18,7 +18,7 @@ then npm install -g > /dev/null npm install > /dev/null set -x - stylelint "phpBB/styles/prosilver/theme/*.css" + node_modules/stylelint/bin/stylelint.js "phpBB/styles/prosilver/theme/*.css" # Disable admin stylelint for now - stylelint "phpBB/adm/style/*.css" + node_modules/stylelint/bin/stylelint.js "phpBB/adm/style/*.css" fi