From f6fb1561d73e884f3512acfb1b18bfa53dbb1d74 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Thu, 15 Sep 2016 11:33:37 +0100 Subject: [PATCH 1/6] Update the version of olm to 1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b407a892..be0877a45 100644 --- 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" } } From e8a12e7ddc60abaff9421303c600ba22dec92733 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 16 Sep 2016 17:27:52 +0100 Subject: [PATCH 2/6] Revert "fix instructions" This reverts commit 6a131550136f88ad07d42479a1adc7dc75c953e2. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fb750ffe6..394e7c351 100644 --- 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: ``` From 838608afab87af26d67145aebdf3de6769b716e2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 16 Sep 2016 18:15:15 +0100 Subject: [PATCH 3/6] Make redeploy script symlink config --- deploy/redeploy.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deploy/redeploy.py b/deploy/redeploy.py index fd81929a0..5965f10dc 100755 --- a/deploy/redeploy.py +++ b/deploy/redeploy.py @@ -5,8 +5,8 @@ from urlparse import urljoin 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,8 @@ def on_receive_jenkins_poke(): create_symlink(source=os.path.join(untar_location, "vector"), linkname=arg_symlink) + create_symlink(source=arg_config_location linkname=os.path.join(untar_location, "vector", 'config.json')) + return jsonify({}) if __name__ == "__main__": @@ -162,9 +164,10 @@ if __name__ == "__main__": 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) From 4725fa4c2d19619107561056143d024109624d8a Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 16 Sep 2016 18:21:33 +0100 Subject: [PATCH 4/6] Missed a comma --- deploy/redeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/redeploy.py b/deploy/redeploy.py index 5965f10dc..95ef31dd2 100755 --- a/deploy/redeploy.py +++ b/deploy/redeploy.py @@ -122,7 +122,7 @@ def on_receive_jenkins_poke(): create_symlink(source=os.path.join(untar_location, "vector"), linkname=arg_symlink) - create_symlink(source=arg_config_location linkname=os.path.join(untar_location, "vector", 'config.json')) + create_symlink(source=arg_config_location, linkname=os.path.join(untar_location, "vector", 'config.json')) return jsonify({}) From 7fc4b1cb35d6f0e160e98571e5a0e590c3ac6b26 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 16 Sep 2016 18:26:46 +0100 Subject: [PATCH 5/6] Actually ad the arg to argparse --- deploy/redeploy.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deploy/redeploy.py b/deploy/redeploy.py index 95ef31dd2..2839422bd 100755 --- a/deploy/redeploy.py +++ b/deploy/redeploy.py @@ -122,7 +122,8 @@ def on_receive_jenkins_poke(): create_symlink(source=os.path.join(untar_location, "vector"), linkname=arg_symlink) - create_symlink(source=arg_config_location, linkname=os.path.join(untar_location, "vector", 'config.json')) + if arg_config_location: + create_symlink(source=arg_config_location, linkname=os.path.join(untar_location, "vector", 'config.json')) return jsonify({}) @@ -156,6 +157,12 @@ if __name__ == "__main__": 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 From 48fb57895248243f9f16106d859de073d96f34e3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 16 Sep 2016 18:31:47 +0100 Subject: [PATCH 6/6] Empty commit to test /develop redeploy