From 2696b9af9651dac45d8e945f1e9664b4cfd18dce Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 30 Oct 2015 20:08:46 +0100
Subject: [PATCH] Add travis support Squashed commit of the following:
commit f9a7a1fd51dd2c857fc52923be8f2e98f059f923
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 20:05:20 2015 +0100
This is electron-prebuilt and not just electron
commit a2361482942abe4443c68e61fdcfea9bf35ede61
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 19:58:56 2015 +0100
Let's try to change this option...
commit 7ee8bfa9bf34b0165a7ef51bc9397bf86ff54878
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 19:39:23 2015 +0100
Explicitly say to generate a rsa key of length 2048
commit d3905aef92b537c395a9111d5d0c6f4da8b322ba
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 19:22:46 2015 +0100
typo
commit 602cb774848da906ec693999484b618618f70846
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 19:21:26 2015 +0100
Add after_failure, cache for grunt and electron
commit 79f7c7f7b7a9a0726de0b7b1af1cda69a4d401cc
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 19:10:25 2015 +0100
increase timewait when uploading a video (for the federation)
commit 3c8dd590dd53ab2b069d6a52cd8e954156814304
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 19:00:26 2015 +0100
install grunt-cli
commit 1b5d02fb067a7b4cde62a6dd5073b76e5f1ba269
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 18:55:23 2015 +0100
Trigger travis build
commit ede965e1186c4dc25270c384f669f0d6749d2a9d
Author: Chocobozzz <florian.bigard@gmail.com>
Date: Fri Oct 30 18:52:08 2015 +0100
let's try travis
---
.travis.yml | 24 ++++++++++++++++++++++++
src/utils.js | 2 +-
test/api/multiplePods.js | 2 +-
3 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 .travis.yml
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..1729160f1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+language: node_js
+
+node_js:
+ - "0.12"
+
+sudo: false
+
+services:
+ - mongodb
+
+cache:
+ directories:
+ - node_modules
+ - $(npm config get prefix)/bin/grunt-cli
+ - $(npm config get prefix)/bin/electron-prebuilt
+
+before_script:
+ - npm install electron-prebuilt -g
+ - npm install grunt-cli -g
+
+after_failure:
+ - cat test1/logs/all-logs.log
+ - cat test2/logs/all-logs.log
+ - cat test3/logs/all-logs.log
diff --git a/src/utils.js b/src/utils.js
index 82a62c43f..7a5c7b7ea 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -125,7 +125,7 @@
}
logger.debug('Gen RSA keys...')
- openssl.exec('genrsa', { 'out': utils.certDir + 'peertube.key.pem' }, function (err) {
+ openssl.exec('genrsa', { 'out': utils.certDir + 'peertube.key.pem', '2048': false }, function (err) {
if (err) {
logger.error('Cannot create private key on this pod.', { error: err })
return callback(err)
diff --git a/test/api/multiplePods.js b/test/api/multiplePods.js
index 81d4b06b6..511c1b975 100644
--- a/test/api/multiplePods.js
+++ b/test/api/multiplePods.js
@@ -65,7 +65,7 @@
done()
})
})
- }, 1000)
+ }, 5000)
})
})
})