web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-14 11:23:30 +02:00
Code Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
heff 2015-02-26 17:59:16 -08:00
commit 3fdef79b9b
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Gruntfile.js
View File

@ -1,5 +1,5 @@
module.exports = function(grunt) {
var pkg, s3, version, verParts;
var pkg, version, verParts;
pkg = grunt.file.readJSON('package.json');
@ -85,34 +85,33 @@ module.exports = function(grunt) {
]
}
},
s3: {
aws_s3: {
options: {
key: process.env.VJS_S3_KEY,
secret: process.env.VJS_S3_SECRET,
accessKeyId: process.env.VJS_S3_KEY,
secretAccessKey: process.env.VJS_S3_SECRET,
bucket: process.env.VJS_S3_BUCKET,
access: 'public-read'
access: 'public-read',
uploadConcurrency: 5
},
minor: {
upload: [
patch: {
files: [
{
src: 'dist/cdn/*',
dest: 'vjs/'+version.majorMinor+'/',
rel: 'dist/cdn/',
headers: {
'Cache-Control': 'public, max-age=2628000'
}
expand: true,
cwd: 'dist/cdn/',
src: ['**'],
dest: 'vjs/'+version.full+'/',
params: { CacheControl: 'public, max-age=31536000' }
}
]
},
patch: {
upload: [
minor: {
files: [
{
src: 'dist/cdn/*',
dest: 'vjs/'+version.full+'/',
rel: 'dist/cdn/',
headers: {
'Cache-Control': 'public, max-age=31536000'
}
expand: true,
cwd: 'dist/cdn/',
src: ['**'],
dest: 'vjs/'+version.majorMinor+'/',
params: { CacheControl: 'public, max-age=2628000' }
}
]
}
@ -356,7 +355,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-s3');
grunt.loadNpmTasks('contribflow');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('videojs-doc-generator');
@ -366,6 +364,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('chg');
grunt.loadNpmTasks('grunt-fastly');
grunt.loadNpmTasks('grunt-github-releaser');
grunt.loadNpmTasks('grunt-aws-s3');
// grunt.loadTasks('./docs/tasks/');
// grunt.loadTasks('../videojs-doc-generator/tasks/');

1
package.json
View File

@ -30,6 +30,7 @@
"contribflow": "~0.2.0",
"github": "~0.1.14",
"grunt": "^0.4.4",
"grunt-aws-s3": "^0.12.1",
"grunt-banner": "~0.2.0",
"grunt-cli": "~0.1.0",
"grunt-contrib-clean": "~0.4.0a",