Skip to content
This repository has been archived by the owner on Feb 7, 2023. It is now read-only.

Commit

Permalink
Update dependencies and remove SauceLabs for now
Browse files Browse the repository at this point in the history
  • Loading branch information
alippai committed Dec 28, 2017
1 parent 4d39712 commit 8dd4735
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 35 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ test/aes.asm.js
test/aes.asm.js.map
doc/
node_modules/
.idea/
package-lock.json
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
language: node_js
node_js:
- '4'
- '6'
addons:
sauce_connect:
username: vibornoff
access_key:
secure: N5jZowSuf5vPTUSgnYIX4sdFV3u0z/b8DMBSbMzst34VahI428jJlTPfMcswVomflwIA5dO0KgvCvRpKnos4gVIG02PUNYsCSuwg5nBOq025r8PX1nI3tYBK0n1SHHFYQs9swqeiKVVE0bG1AwrIAMNqJS5DnxMBw7z/dM6cPf8=
- '8'
- '9'
sudo: false
before_install:
export WITH=ALL
script:
grunt test && grunt sauce
grunt test
14 changes: 0 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadNpmTasks('grunt-jsdoc');
grunt.loadNpmTasks('grunt-rollup');

Expand Down Expand Up @@ -135,18 +134,6 @@ module.exports = function (grunt) {
}
},

'saucelabs-qunit': {
all: {
options: {
testname: 'asmcrypto.js',
urls: ['http://localhost:9999/'],
browsers: browsers,
build: process.env.TRAVIS_JOB_ID,
'max-duration': 600
}
}
},

connect: {
all: {
options: {
Expand Down Expand Up @@ -177,5 +164,4 @@ module.exports = function (grunt) {
grunt.registerTask('default', ['rollup:default', 'rollup:test_AES_ASM', 'uglify']);
grunt.registerTask('devel', ['rollup:all', 'rollup:test_AES_ASM', 'connect', 'watch']);
grunt.registerTask('test', ['connect', 'qunit']);
grunt.registerTask('sauce', ['connect', 'saucelabs-qunit']);
};
24 changes: 10 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,16 @@
},
"devDependencies": {
"uglify-js": "vibornoff/UglifyJS2",
"grunt": "~0.4",
"grunt-cli": "~0.1",
"grunt-contrib-uglify": "~0.9",
"grunt-contrib-concat": "~0.5",
"grunt-contrib-qunit": "~0.4",
"grunt-contrib-connect": "~0.7",
"grunt-contrib-watch": "~0.2",
"grunt-contrib-clean": "~0.4",
"grunt-saucelabs": "~8.0",
"grunt-jsdoc": "~0.6",
"grunt-rollup": "^2.0.1"
},
"engines": {
"node": "~0.10"
"grunt": "~1.0",
"grunt-cli": "~1.2",
"grunt-contrib-uglify": "~3.3",
"grunt-contrib-concat": "~1.0",
"grunt-contrib-qunit": "~2.0",
"grunt-contrib-connect": "~1.0",
"grunt-contrib-watch": "~1.0",
"grunt-contrib-clean": "~1.1",
"grunt-jsdoc": "~2.2",
"grunt-rollup": "^8.2.0"
},
"scripts": {
"prepublish": "grunt",
Expand Down

0 comments on commit 8dd4735

Please sign in to comment.