diff --git a/.gitignore b/.gitignore index 806382b..b6dc0c8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules *.log .DS_Store ./bundle.js +package-lock.json diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..02dad9e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: node_js +install: npm install +node_js: + - '4' + - '6' + - '8' + - '10' +os: + - linux + - windows +cache: + directories: + - 'node_modules' diff --git a/README.md b/README.md index f94f876..4d28ce2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # glslify [![stability][0]][1] -[![npm version][2]][3] [![downloads][4]][5] +[![npm version][2]][3] [![downloads][4]][5] [![travis][6]][7] A node.js-style module system for GLSL! @@ -548,3 +548,5 @@ MIT. See [LICENSE.md](http://github.com/stackgl/glslify/blob/master/LICENSE.md) [3]: https://npmjs.org/package/glslify [4]: http://img.shields.io/npm/dm/glslify.svg?style=flat-square [5]: https://npmjs.org/package/glslify +[6]: http://img.shields.io/travis/glslify/glslify.svg?style=flat-square +[7]: https://travis-ci.org/glslify/glslify diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 1ddb975..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,16 +0,0 @@ -environment: - matrix: - - nodejs_version: '0.12' - - nodejs_version: '4' - - nodejs_version: '6' - -install: - - ps: Install-Product node $env:nodejs_version x64 - - npm install - -test_script: - - node --version - - npm --version - - npm t - -build: off diff --git a/package.json b/package.json index 5147b17..93a9dfd 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ }, "license": "MIT", "scripts": { - "test": "npm run test-node && npm run test-electron", - "test-node": "node test | tap-spec", - "test-electron": "test/electron.sh" + "test": "npm run test:node", + "test:node": "node test", + "test:electron": "test/electron.sh" }, "authors": [ "Hugh Kennedy (http://hughsk.io/)", diff --git a/test/cli.js b/test/cli.js index 4a8123e..a7c81ea 100644 --- a/test/cli.js +++ b/test/cli.js @@ -5,11 +5,11 @@ const test = require('tape') const path = require('path') const fs = require('fs') const bl = require('bl') -const glslify = require.resolve('../bin') +const glslify = './bin.js' test('cli: globe.frag', function(t) { - exec('node '+quote([ glslify, - path.join(__dirname, 'fixtures', 'globe.frag'), + exec('node ' + quote([ glslify, + path.join('test', 'fixtures', 'globe.frag'), '-t', 'glslify-hex' ]), function(err, stdout, stderr) { if (err) return t.ifError(err) @@ -23,8 +23,8 @@ test('cli: globe.frag', function(t) { }) test('cli: globe.vert', function(t) { - exec('node '+quote([ glslify, - path.join(__dirname, 'fixtures', 'globe.vert'), + exec('node ' + quote([ glslify, + path.join('test', 'fixtures', 'globe.vert'), '-t', 'glslify-hex' ]), function(err, stdout, stderr) { if (err) return t.ifError(err) @@ -46,7 +46,7 @@ test('cli: globe.vert', function(t) { test.skip('cli: globe.vert (inline)', function(t) { var ps = spawn(glslify, [ '-t', 'glslify-hex' ]) - fs.createReadStream(path.join(__dirname, 'fixtures', 'globe.vert')) + fs.createReadStream(path.join('test', 'fixtures', 'globe.vert')) .pipe(ps.stdin) ps.stdout.pipe(bl(function(err, stdout1) { @@ -55,7 +55,7 @@ test.skip('cli: globe.vert (inline)', function(t) { stdout1 += '' exec(quote([ glslify, - path.join(__dirname, 'fixtures', 'globe.vert'), + path.join('test', 'fixtures', 'globe.vert'), '-t', 'glslify-hex' ]), function(err, stdout2) { if (err) return t.ifError(err)