From bfd01263565f15424c70ffe6ad20db67966de707 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 12 May 2013 21:15:35 +0100 Subject: [PATCH 1/5] Very very basic travis setup. Will be able to configure this to be much better & more useful once grunt is all setup. --- .travis.yml | 5 +++++ package.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..b8fe41eb89 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: + - "0.11" + - "0.10" + - "0.8" \ No newline at end of file diff --git a/package.json b/package.json index ae33d32f32..9988f6906a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "version": "0.0.1", "private": true, "scripts": { - "start": "node app" + "start": "node app", + "test": "nodeunit core/test/ghost" }, "dependencies": { "express": "3.1.0", From 267dc12b769be4e3aa286067e78a757b4a2e0638 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 12 May 2013 21:22:58 +0100 Subject: [PATCH 2/5] Updates to travis setup to cope with the submodule. --- .gitmodules | 2 +- .travis.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4020711c1a..a80bd0ca96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "content/themes/casper"] path = content/themes/casper - url = git@github.com:TryGhost/Casper.git + url = git://github.com/TryGhost/Casper.git diff --git a/.travis.yml b/.travis.yml index b8fe41eb89..91d6f7e1cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,6 @@ language: node_js node_js: - "0.11" - "0.10" - - "0.8" \ No newline at end of file + - "0.8" +before_install: + - git submodule update --init --recursive \ No newline at end of file From a40d01ec489ee4540c7306e5cfba8c3aef6dc022 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 12 May 2013 22:18:26 +0100 Subject: [PATCH 3/5] (More) updates to travis setup to cope with the submodule. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91d6f7e1cd..9a29a50862 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ node_js: - "0.11" - "0.10" - "0.8" -before_install: - - git submodule update --init --recursive \ No newline at end of file +git: +submodules: false \ No newline at end of file From 5e7335aa4f50c2db01cffeb2f1bdcbca18ec3c98 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 12 May 2013 22:21:25 +0100 Subject: [PATCH 4/5] (Even more) updates to travis setup to cope with the submodule. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a29a50862..4a0fa81e6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ node_js: - "0.10" - "0.8" git: -submodules: false \ No newline at end of file + submodules: false \ No newline at end of file From 590b736a72e059ca39b3675f4b4b1da0279398bb Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 12 May 2013 22:27:12 +0100 Subject: [PATCH 5/5] Vain attempt to get node polyglot to install properly --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9988f6906a..877f3fa31d 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,16 @@ "express": "3.1.0", "express-hbs": "*", "connect-flash": "*", + "node-polyglot": "0.2.1", "css": "*", "moment": "*", "underscore": "*", - "nodeunit": "*", "showdown": "*", - "node-polyglot": "*", "sqlite3": "2.1.7", "jugglingdb": "0.2.x", "jugglingdb-sqlite3": "git+https://github.com/jugglingdb/sqlite3-adapter.git#master" + }, + "devDependencies": { + "nodeunit": "*" } } \ No newline at end of file