gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
David Baker 2016-09-16 20:16:33 +01:00
parent 3d97061d78 48fb578952
commit 0bce7f3102
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -151,7 +151,7 @@ Then similarly with `matrix-react-sdk`:
1. `git checkout develop` 1. `git checkout develop`
1. `npm install` 1. `npm install`
1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/` 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: Finally, build and start vector itself:
@ -161,7 +161,7 @@ Finally, build and start vector itself:
1. `npm install` 1. `npm install`
1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/` 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. `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: 1. Wait a few seconds for the initial build to finish; you should see something like:
``` ```

18
deploy/redeploy.py
View File

@ -5,8 +5,8 @@ from urlparse import urljoin
from flask import Flask, jsonify, request, abort from flask import Flask, jsonify, request, abort
app = Flask(__name__) app = Flask(__name__)
arg_jenkins_url, arg_extract_path, arg_should_clean, arg_symlink = ( arg_jenkins_url, arg_extract_path, arg_should_clean, arg_symlink, arg_config_location = (
None, None, None, None None, None, None, None, None
) )
def download_file(url): 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) 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({}) return jsonify({})
if __name__ == "__main__": if __name__ == "__main__":
@ -154,6 +157,12 @@ if __name__ == "__main__":
to the /vector directory INSIDE the tarball." 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() args = parser.parse_args()
if args.jenkins.endswith("/"): # important for urljoin if args.jenkins.endswith("/"): # important for urljoin
arg_jenkins_url = args.jenkins arg_jenkins_url = args.jenkins
@ -162,9 +171,10 @@ if __name__ == "__main__":
arg_extract_path = args.extract arg_extract_path = args.extract
arg_should_clean = args.clean arg_should_clean = args.clean
arg_symlink = args.symlink arg_symlink = args.symlink
arg_config_location = args.config
print( 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, (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) app.run(host="0.0.0.0", port=args.port, debug=True)

2
package.json
View File

@ -90,6 +90,6 @@
"webpack": "^1.12.14" "webpack": "^1.12.14"
}, },
"optionalDependencies": { "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"
} }
} }