diff --git a/.travis.yml b/.travis.yml
index cc571e0..49754a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ env:
- TRAVIS_NODE_VERSION="5"
- TRAVIS_NODE_VERSION="6"
- TRAVIS_NODE_VERSION="7"
- - TRAVIS_NODE_VERSION="7" NWJS_VERSION="0.21.3"
os:
- linux
- osx
@@ -43,8 +42,6 @@ before_install:
- git clone --branch v0.33.1 https://github.com/creationix/nvm.git ~/.nvm
- source ~/.nvm/nvm.sh
- nvm install "$TRAVIS_NODE_VERSION"
- - if [ -n "$NWJS_VERSION" ]; then export DISPLAY=:99.0 ; sh -e /etc/init.d/xvfb start || true ; sleep 3 ; fi
- - if [ -n "$NWJS_VERSION" ]; then npm install "nw@$NWJS_VERSION" "nw-gyp@$NWJS_VERSION"; export NPG_ARGS="--runtime=node-webkit --target=$NWJS_VERSION"; fi
- node --version
# no coverage for tags (they are release builds!)
- if [ -z "$TRAVIS_TAG" ]; then export DO_COVERAGE=1; fi
@@ -53,15 +50,14 @@ before_install:
- echo "CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
- npm install node-gyp@3.5.0
install:
- - npm install $NPMOPT --build-from-source $NPG_ARGS
+ - npm install $NPMOPT --build-from-source
script:
- - if [ -z "$NWJS_VERSION" ]; then node --expose-gc ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- -R spec -s 1000 -t 5000; fi
- - if [ -n "$NWJS_VERSION" ]; then (cd test/nwjs && nw && node exitcode.js); fi
+ - node --expose-gc ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- -R spec -s 1000 -t 5000
- npm run jshint
after_success:
- if [ -n "$DO_COVERAGE" ]; then cpp-coveralls --gcov-options '\-lp' --build-root build --exclude build/liblzma --exclude node_modules --dump coverage/cppfiles.json; fi
- if [ -n "$DO_COVERAGE" ]; then coveralls --stdout < coverage/lcov.info > coverage/jsfiles.json; fi
- if [ -n "$DO_COVERAGE" ]; then coveralls-merge coverage/jsfiles.json coverage/cppfiles.json; fi
# publish for node-pre-gyp
- - node-pre-gyp package $NPG_ARGS
+ - node-pre-gyp package
- if [ -n "$TRAVIS_TAG" -a $CXX = "g++-4.8" ]; then echo 'put build/stage/lzma-native/* uploads/lzma-native/' |sftp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -b- -i .travis.id_rsa node-pre-gyp@entless.org; fi
diff --git a/appveyor.yml b/appveyor.yml
index 26eef4a..aab9a67 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,12 +12,6 @@ environment:
platform: x64
- nodejs_version: "5"
platform: x86
-# - nodejs_version: "5"
-# platform: x86
-# nwjs_version: "0.12.3"
-# - nodejs_version: "5"
-# platform: x64
-# nwjs_version: "0.12.3"
- nodejs_version: "4.3.0"
platform: x86
- nodejs_version: "4.3.0"
@@ -39,16 +33,13 @@ install:
- npm install node-gyp@3.5.0
- IF %nodejs_version% LSS 1 npm -g install npm
- IF %nodejs_version% LSS 1 set PATH=%APPDATA%\npm;%PATH%
- - IF NOT "%nwjs_version%" == "" set NPG_ARGS=--runtime=node-webkit --target=%NWJS_VERSION%
- - IF NOT "%nwjs_version%" == "" npm install nw@%NWJS_VERSION% nw-gyp@%NWJS_VERSION%
- npm run prepare
- - npm install --build-from-source %NPG_ARGS%
+ - npm install --build-from-source
- node_modules\.bin\node-pre-gyp package --target_arch=%PLATFORM:x86=ia32% %NPG_ARGS%
- move build\stage\lzma-native lzma-native
test_script:
- - IF "%nwjs_version%" == "" npm test
- - IF NOT "%nwjs_version%" == "" pushd test\nwjs && (..\..\node_modules\.bin\nw & node exitcode.js & popd)
+ - npm test
build: off
diff --git a/test/nwjs/.gitignore b/test/nwjs/.gitignore
deleted file mode 100644
index b834f6c..0000000
--- a/test/nwjs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-exitcode.js
diff --git a/test/nwjs/index.html b/test/nwjs/index.html
deleted file mode 100644
index 8c6b2ab..0000000
--- a/test/nwjs/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-lzma-native nw.js test
-
-
-
-
-
diff --git a/test/nwjs/package.json b/test/nwjs/package.json
deleted file mode 100644
index 14b2e93..0000000
--- a/test/nwjs/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "lzma-native-nwjstest",
- "version": "0.0.1",
- "author": {
- "name": "Anna Henningsen",
- "email": "sqrt@entless.org"
- },
- "description": "nw.js test for lzma-native",
- "main": "index.html",
- "license": "MIT"
-}