From bb6d3d46ba7fd5d1d127f1d2596da075efbc239a Mon Sep 17 00:00:00 2001 From: Nikolay Khabarov Date: Thu, 31 Oct 2019 13:22:07 +0300 Subject: [PATCH] add node13 support by updating node-sass version, fix jenkins build, remove old nodejs 0.12 from tests since mocha doens't support that since 4.0.0 --- .travis.yml | 21 +++++++++++++++------ package.json | 2 +- test/fixtures/source-map-embed/expected.css | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff1d2ad..92d8b5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: node_js -node_js +node_js: + - "13" - "12" - "11" - "10" @@ -8,7 +9,6 @@ node_js - "7" - "6" - "4" - - "0.12" - "iojs" compiler: gcc @@ -38,14 +38,23 @@ addons: packages: - gcc-4.7 - g++-4.7 + - gcc-4.9 + - g++-4.9 before_install: - npm config set python `which python` - if [ $TRAVIS_OS_NAME == "linux" ]; then - export CC="gcc-4.7"; - export CXX="g++-4.7"; - export LINK="gcc-4.7"; - export LINKXX="g++-4.7"; + if (( $(node -v | sed 's/v//' | sed 's/\..*$//') > 9 )); 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 - nvm --version - node --version diff --git a/package.json b/package.json index 524f0b4..e4b7883 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "meow": "^3.7.0", - "node-sass": "4.12", + "node-sass": "4.13", "sass-graph": "^2.1.1", "stdout-stream": "^1.4.0" }, diff --git a/test/fixtures/source-map-embed/expected.css b/test/fixtures/source-map-embed/expected.css index 343a105..56f2e59 100644 --- a/test/fixtures/source-map-embed/expected.css +++ b/test/fixtures/source-map-embed/expected.css @@ -10,4 +10,4 @@ #navbar li a { font-weight: bold; } -/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZml4dHVyZXMvc291cmNlLW1hcC1lbWJlZC9pbmRleC5jc3MiLAoJInNvdXJjZXMiOiBbCgkJImZpeHR1cmVzL3NvdXJjZS1tYXAtZW1iZWQvaW5kZXguc2NzcyIKCV0sCgkibmFtZXMiOiBbXSwKCSJtYXBwaW5ncyI6ICJBQUFBLEFBQUEsT0FBTyxDQUFDO0VBQ04sS0FBSyxFQUFFLEdBQUc7RUFDVixNQUFNLEVBQUUsSUFBSSxHQUNiOztBQUVELEFBQVEsT0FBRCxDQUFDLEVBQUUsQ0FBQztFQUNULGVBQWUsRUFBRSxJQUFJLEdBQ3RCOztBQUVELEFBQVEsT0FBRCxDQUFDLEVBQUUsQ0FBQztFQUNULEtBQUssRUFBRSxJQUFJLEdBS1o7RUFORCxBQUdFLE9BSEssQ0FBQyxFQUFFLENBR1IsQ0FBQyxDQUFDO0lBQ0EsV0FBVyxFQUFFLElBQUksR0FDbEIiCn0= */ +/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZml4dHVyZXMvc291cmNlLW1hcC1lbWJlZC9pbmRleC5jc3MiLAoJInNvdXJjZXMiOiBbCgkJImZpeHR1cmVzL3NvdXJjZS1tYXAtZW1iZWQvaW5kZXguc2NzcyIKCV0sCgkibmFtZXMiOiBbXSwKCSJtYXBwaW5ncyI6ICJBQUFBLEFBQUEsT0FBTyxDQUFDO0VBQ04sS0FBSyxFQUFFLEdBQUc7RUFDVixNQUFNLEVBQUUsSUFBSSxHQUNiOztBQUVELEFBQUEsT0FBTyxDQUFDLEVBQUUsQ0FBQztFQUNULGVBQWUsRUFBRSxJQUFJLEdBQ3RCOztBQUVELEFBQUEsT0FBTyxDQUFDLEVBQUUsQ0FBQztFQUNULEtBQUssRUFBRSxJQUFJLEdBS1o7RUFORCxBQUdFLE9BSEssQ0FBQyxFQUFFLENBR1IsQ0FBQyxDQUFDO0lBQ0EsV0FBVyxFQUFFLElBQUksR0FDbEIiCn0= */