Merge remote-tracking branch 'origin/develop' into dbkr/paginate_publicrooms

dbkr · dbkr · commit 0bce7f310211 · 2016-09-16T20:16:33.000+01:00
diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ Then similarly with `matrix-react-sdk`:
 1. `git checkout develop`
 1. `npm install`
 1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/`
-1. `npm run start`
+1. `popd`
 
 Finally, build and start vector itself:
 
@@ -161,7 +161,7 @@ Finally, build and start vector itself:
 1. `npm install`
 1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/`
 1. `rm -r node_modules/matrix-react-sdk; ln -s ../../matrix-react-sdk node_modules/`
-1. `npm run start`
+1. `npm start`
 1. Wait a few seconds for the initial build to finish; you should see something like:
 
     ```
diff --git a/deploy/redeploy.py b/deploy/redeploy.py
@@ -5,8 +5,8 @@
 from flask import Flask, jsonify, request, abort
 app = Flask(__name__)
 
-arg_jenkins_url, arg_extract_path, arg_should_clean, arg_symlink = (
-    None, None, None, None
+arg_jenkins_url, arg_extract_path, arg_should_clean, arg_symlink, arg_config_location = (
+    None, None, None, None, None
 )
 
 def download_file(url):
@@ -122,6 +122,9 @@ def on_receive_jenkins_poke():
 
     create_symlink(source=os.path.join(untar_location, "vector"), linkname=arg_symlink)
 
+    if arg_config_location:
+        create_symlink(source=arg_config_location, linkname=os.path.join(untar_location, "vector", 'config.json'))
+
     return jsonify({})
 
 if __name__ == "__main__":
@@ -154,6 +157,12 @@ def on_receive_jenkins_poke():
             to the /vector directory INSIDE the tarball."
         )
     )
+    parser.add_argument(
+        "--config", dest="config", help=(
+            "Write a symlink to config.json in the extracted tarball. \
+            To this location."
+        )
+    )
     args = parser.parse_args()
     if args.jenkins.endswith("/"): # important for urljoin
         arg_jenkins_url = args.jenkins
@@ -162,9 +171,10 @@ def on_receive_jenkins_poke():
     arg_extract_path = args.extract
     arg_should_clean = args.clean
     arg_symlink = args.symlink
+    arg_config_location = args.config
     print(
-        "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s" %
+        "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Config location: %s" %
         (args.port, arg_extract_path,
-            " (clean after)" if arg_should_clean else "", arg_symlink, arg_jenkins_url)
+            " (clean after)" if arg_should_clean else "", arg_symlink, arg_jenkins_url, arg_config_location)
     )
     app.run(host="0.0.0.0", port=args.port, debug=True)
diff --git a/package.json b/package.json
@@ -90,6 +90,6 @@
     "webpack": "^1.12.14"
   },
   "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-1.2.0.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,6 @@`
`90`	`90`	`"webpack": "^1.12.14"`
`91`	`91`	`},`
`92`	`92`	`"optionalDependencies": {`
`93`		`- "olm": "https://matrix.org/packages/npm/olm/olm-1.2.0.tgz"`
	`93`	`+ "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"`
`94`	`94`	`}`
`95`	`95`	`}`