From ffab13d43ab6bbff4cfcbe2b4808fa7f56917156 Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Wed, 20 Apr 2016 21:57:19 -0300 Subject: [PATCH 1/2] add services file --- server-ce/Gruntfile.coffee | 42 +---------------------------------- server-ce/config/services.js | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 server-ce/config/services.js diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index 9ed6ff9275..e1eba4ef32 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -10,47 +10,7 @@ async = require "async" settings = require("settings-sharelatex") -SERVICES = [{ - name: "web" - repo: "https://github.com/sharelatex/web-sharelatex.git" - version: "master" -}, { - name: "real-time" - repo: "https://github.com/sharelatex/real-time-sharelatex.git" - version: "master" -}, { - name: "document-updater" - repo: "https://github.com/sharelatex/document-updater-sharelatex.git" - version: "master" -}, { - name: "clsi" - repo: "https://github.com/sharelatex/clsi-sharelatex.git" - version: "master" -}, { - name: "filestore" - repo: "https://github.com/sharelatex/filestore-sharelatex.git" - version: "master" -}, { - name: "track-changes" - repo: "https://github.com/sharelatex/track-changes-sharelatex.git" - version: "master" -}, { - name: "docstore" - repo: "https://github.com/sharelatex/docstore-sharelatex.git" - version: "master" -}, { - name: "chat" - repo: "https://github.com/sharelatex/chat-sharelatex.git" - version: "master" -}, { - name: "tags" - repo: "https://github.com/sharelatex/tags-sharelatex.git" - version: "master" -}, { - name: "spelling" - repo: "https://github.com/sharelatex/spelling-sharelatex.git" - version: "master" -}] +SERVICES = require("./config/services") module.exports = (grunt) -> grunt.loadNpmTasks 'grunt-bunyan' diff --git a/server-ce/config/services.js b/server-ce/config/services.js new file mode 100644 index 0000000000..be4da8698a --- /dev/null +++ b/server-ce/config/services.js @@ -0,0 +1,43 @@ +module.exports = + +[{ + name: "web", + repo: "https://github.com/sharelatex/web-sharelatex.git", + version: "master" +}, { + name: "real-time", + repo: "https://github.com/sharelatex/real-time-sharelatex.git", + version: "master" +}, { + name: "document-updater", + repo: "https://github.com/sharelatex/document-updater-sharelatex.git", + version: "master" +}, { + name: "clsi", + repo: "https://github.com/sharelatex/clsi-sharelatex.git", + version: "master" +}, { + name: "filestore", + repo: "https://github.com/sharelatex/filestore-sharelatex.git", + version: "master" +}, { + name: "track-changes", + repo: "https://github.com/sharelatex/track-changes-sharelatex.git", + version: "master" +}, { + name: "docstore", + repo: "https://github.com/sharelatex/docstore-sharelatex.git", + version: "master" +}, { + name: "chat", + repo: "https://github.com/sharelatex/chat-sharelatex.git", + version: "master" +}, { + name: "tags", + repo: "https://github.com/sharelatex/tags-sharelatex.git", + version: "master" +}, { + name: "spelling", + repo: "https://github.com/sharelatex/spelling-sharelatex.git", + version: "master" +}] From 49eb1c6ac4d4b9902ea2f1697f4858fe73406c3d Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 23 Jun 2016 20:47:44 +0100 Subject: [PATCH 2/2] don't clone via branch --- server-ce/Gruntfile.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index 8083450ab6..90408abd23 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -155,7 +155,6 @@ module.exports = (grunt) -> if !fs.existsSync(dir) proc = spawn "git", [ "clone", - "-b", service.version, repo_src, dir ], stdio: "inherit"