Skip to content

Commit

Permalink
Merge 4292b87 into 873f460
Browse files Browse the repository at this point in the history
  • Loading branch information
knksmith57 committed Mar 13, 2019
2 parents 873f460 + 4292b87 commit b02e5af
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 2,052 deletions.
5 changes: 4 additions & 1 deletion .gitignore
@@ -1,3 +1,6 @@
node_modules
coverage
.idea
.idea

package-lock.json
yarn.lock
1 change: 1 addition & 0 deletions .npmrc
@@ -0,0 +1 @@
package-lock=false
30 changes: 25 additions & 5 deletions .travis.yml
Expand Up @@ -11,17 +11,37 @@ cache:
# - https://github.com/hexojs/hexo/blob/master/.travis.yml
# - https://github.com/sass/node-sass/blob/master/.travis.yml
node_js:
- "4"
- "6"
- "8"
- "10"
- "node"
env:
- CXX=g++-4.8

addons:
apt:
sources:
- ubuntu-toolchain-r-test
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- gcc-4.7
- g++-4.7
- gcc-4.9
- g++-4.9

# https://github.com/sass/node-sass/blob/0c31dc2/.travis.yml#L73-L88
before_install:
- npm config set python `which python`
- if [ $TRAVIS_OS_NAME == "linux" ]; then
if [[ $(node -v) =~ v1[01] ]]; then
export CC="gcc-4.9";
export CXX="g++-4.9";
export LINK="gcc-4.9";
export LINKXX="g++-4.9";
else
export CC="gcc-4.7";
export CXX="g++-4.7";
export LINK="gcc-4.7";
export LINKXX="g++-4.7";
fi
fi

script:
- npm run lint
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -21,7 +21,7 @@
"test-cov": "istanbul cover --print both _mocha -- test/index.js"
},
"engines": {
"node": ">= 4"
"node": ">= 6"
},
"dependencies": {
"node-sass": "^4.5.3"
Expand Down

0 comments on commit b02e5af

Please sign in to comment.