Skip to content

Run javascript build on travis ci #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 6 commits into from
Jan 31, 2017
Merged

Run javascript build on travis ci #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f034894
Add js build to travis
juliusknorr Jan 31, 2017
50bdd3c
Cleanup JS
juliusknorr Jan 31, 2017
dd93938
Reduce package.json for now
juliusknorr Jan 31, 2017
d8b1af7
Reduce package.json for now
juliusknorr Jan 31, 2017
7845cd3
Remove ng-annotate as we don't minify code and it fails on travis cis…
juliusknorr Jan 31, 2017
dfaf96c
Ignore tests for now
juliusknorr Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ before_install:

before_script:
- cd apps/deck
- make install-npm-deps-dev

script:
- node --version
- npm --version
- make build-js
- make test

after_failure:
Expand Down
13 changes: 2 additions & 11 deletions js/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@


module.exports = function(grunt) {
'use strict';
'use strict';

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-wrap');
grunt.loadNpmTasks('grunt-ng-annotate');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-phpunit');

Expand Down Expand Up @@ -115,18 +114,10 @@ module.exports = function(grunt) {
reporters: ['progress']
}
},

ngAnnotate: {
app: {
src: ['<%= meta.productionJS %>app.js'],
dest: '<%= meta.productionJS %>app.js'
}
}

});

// make tasks available under simpler commands
grunt.registerTask('build', ['jshint', 'concat', 'wrap', 'ngAnnotate']);
grunt.registerTask('build', ['jshint', 'concat', 'wrap']);
grunt.registerTask('js-unit', ['karma:continuous']);

};
100 changes: 0 additions & 100 deletions js/gulpfile.js
View file
Open in desktop

This file was deleted.

52 changes: 22 additions & 30 deletions js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
{
"name": "deck",
"description": "Deck owncloud app",
"version": "0.1.0",
"private": true,
"homepage": "https://github.com/juliushaertl/deck",
"repository": {
"type": "git",
"url": "git@github.com:juliushaertl/deck.git"
},
"dependencies": {
"karma": "^1.1.1",
"bower": "*",
"grunt": "*"
"version": "1.0.0",
"main": "Gruntfile.js",
"directories": {
"test": "tests"
},
"dependencies": {},
"devDependencies": {
"grunt-cli": "*",
"grunt-contrib-concat": "*",
"grunt-contrib-jshint": "*",
"grunt-contrib-watch": "*",
"grunt-karma": "*",
"grunt-ng-annotate": "^1.0.1",
"grunt-phpunit": "*",
"grunt-wrap": "*",
"jasmine-core": "*",
"jshint-stylish": "^2.1.0",
"karma": "*",
"karma-chrome-launcher": "*",
"karma-coverage": "*",
"karma-firefox-launcher": "*",
"karma-jasmine": "*",
"karma-phantomjs-launcher": "*",
"phantomjs": "*"
"bower": "^1.8.0",
"grunt": "^1.0.1",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-jshint": "^1.1.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-karma": "^2.0.0",
"grunt-phpunit": "^0.3.6",
"grunt-wrap": "^0.3.0",
"jshint-stylish": "^2.2.1",
"karma": "^1.4.1"
},
"scripts": {
"test": "echo \"Warning: no test specified\" && exit 0"
},
"engine": "node >= 0.8"
"author": "",
"license": "AGPL-3.0",
"keywords": [],
"description": ""
}