Skip to content

Commit

Permalink
Use rawgit CDN for the validator
Browse files Browse the repository at this point in the history
  • Loading branch information
kewisch committed Apr 14, 2016
1 parent d0e3c5d commit d8dcbd4
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -6,7 +6,8 @@ tools/tzurl
tools/libical
zoneinfo
api
jsdoc-stage
ghpages-stage
/validator.html
coverage/
build/benchmark/ical_upstream.js
junk/
37 changes: 27 additions & 10 deletions Gruntfile.js
Expand Up @@ -29,20 +29,37 @@ module.exports = function(grunt) {
unit: ['test/*_test.js'],
acceptance: ['test/acceptance/*_test.js'],
performance: ['test/performance/*_test.js']
},
validator: {
dev: 'https://rawgit.com/mozilla-comm/ical.js/master/build/ical.js',
prod: 'https://cdn.rawgit.com/mozilla-comm/ical.js/<%= travis.commit %>/build/ical.js',
dest: 'validator.html'
}
},

concat: {
options: {
separator: '',
process: function(src, filepath) {
return src.replace('"use strict";', '');
}
separator: ''
},

dist: {
options: {
process: function(src, filepath) {
return src.replace('"use strict";', '');
}
},
src: ['<%= libinfo.absfiles %>'],
dest: 'build/ical.js'
},

validator: {
options: {
process: function(src, filepath) {
return src.replace(grunt.config('libinfo.validator.dev'), grunt.config('libinfo.validator.prod'));
}
},
src: ['sandbox/validator.html'],
dest: '<%= libinfo.validator.dest %>'
}
},

Expand Down Expand Up @@ -235,16 +252,16 @@ module.exports = function(grunt) {

'gh-pages': {
options: {
clone: 'jsdoc-stage',
clone: 'ghpages-stage',
only: '<%= libinfo.doc %>',
user: {
name: 'Travis CI',
email: 'builds@travis-ci.org',
},
repo: 'git@github.com:mozilla-comm/ical.js.git',
message: 'Update API Documentation for <%= travis.commit %>'
message: 'Update API documentation and validator for <%= travis.commit %>'
},
src: '<%= libinfo.doc %>/**'
src: ['<%= libinfo.doc %>/**', '<%= libinfo.validator.dest %>']
}
});

Expand Down Expand Up @@ -273,16 +290,16 @@ module.exports = function(grunt) {
grunt.loadTasks('tasks');

grunt.registerTask('default', ['package']);
grunt.registerTask('package', ['concat', 'uglify']);
grunt.registerTask('package', ['concat:dist', 'uglify']);
grunt.registerTask('coverage', 'mocha_istanbul');
grunt.registerTask('linters', ['jshint', 'gjslint', 'check-browser-build']);
grunt.registerTask('test-server', ['test-agent-config', 'run-test-server']);
grunt.registerTask('test', ['test-browser', 'test-node']);

grunt.registerTask('doc-ci', ['jsdoc', 'run-on-master-leader:run-with-env:GITHUB_SSH_KEY:gh-pages']);
grunt.registerTask('ghpages-ci', ['jsdoc', 'concat:validator', 'run-on-master-leader:run-with-env:GITHUB_SSH_KEY:gh-pages']);
grunt.registerTask('unit-ci', ['test-node:unit', 'test-node:acceptance', 'run-on-master-leader:karma:ci']);
grunt.registerTask('coverage-ci', ['coverage', 'coveralls']);
grunt.registerTask('test-ci', ['check-browser-build', 'linters', 'unit-ci', 'coverage-ci', 'doc-ci']);
grunt.registerTask('test-ci', ['check-browser-build', 'linters', 'unit-ci', 'coverage-ci', 'ghpages-ci']);

// Additional tasks:
// - tests.js: performance-update, test-node, test-browser,
Expand Down
2 changes: 1 addition & 1 deletion sandbox/validator.html
Expand Up @@ -17,7 +17,7 @@
border: 1px solid black;
}
</style>
<script type="text/javascript" src="https://raw.github.com/mozilla-comm/ical.js/master/build/ical.js"></script>
<script type="text/javascript" src="https://rawgit.com/mozilla-comm/ical.js/master/build/ical.js"></script>
<script type="text/javascript">
function stringError(e) {
return "Error: " + e +
Expand Down

0 comments on commit d8dcbd4

Please sign in to comment.