From 01becf00f5fc60cfba9033053f1ea783aa57c551 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 1 Mar 2019 08:01:26 +0000 Subject: [PATCH 01/36] Try and improve README Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index d7c7ba96..967fea3a 100644 --- a/README.md +++ b/README.md @@ -248,6 +248,18 @@ sudo npm install nativefier -g nativefier https://riot.im/app/ ``` +Desktop app configuration +========================= + +To run multiple instances of the desktop app for different accounts, you can launch the executable with the `--profile` argument followed by a unique identifier, e.g `riot-web --profile Work` for it to run a separate profile and not interfere with the default one. + +To change the config.json for the desktop app, create a config file which will be used to override values in the config which ships in the package: ++ `%APPDATA%\$NAME\config.json` on Windows ++ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux ++ `~Library/Application Support/$NAME/config.json` on macOS + +Where `$NAME` is typically Riot, unless you use `--profile $PROFILE` then its `Riot-$PROFILE`. + Development =========== From a3585c1febac0d39b12b6e69b8342ea9f0a294ed Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 14:56:24 +0000 Subject: [PATCH 02/36] react-sdk & js-sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7a14671f..b88c744b 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.0.1", - "matrix-react-sdk": "1.0.3", + "matrix-js-sdk": "1.0.2-rc.1", + "matrix-react-sdk": "1.0.4-rc.1", "modernizr": "^3.6.0", "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz", "prop-types": "^15.6.2", From 9280d1ff4936023bf16361b0dc7f07584076db64 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 14:57:52 +0000 Subject: [PATCH 03/36] yarn neds --new-version to make a new version --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index ff3e2ce6..33b3676f 100755 --- a/release.sh +++ b/release.sh @@ -41,7 +41,7 @@ tag="v${release}" echo "electron yarn version" cd electron_app -yarn version --no-git-tag-version "$release" +yarn version --no-git-tag-version --new-version "$release" git commit package.json -m "$tag" cd .. From 958e8662d995a270d5dff91f01656192025b3782 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 14:58:28 +0000 Subject: [PATCH 04/36] v1.0.4-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 81985294..2b2a71af 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.0.3", + "version": "1.0.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 98ed6a6a29547665a5f63103588ba3d221c287f1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 15:00:17 +0000 Subject: [PATCH 05/36] Prepare changelog for v1.0.4-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd9256cb..7b4d1ebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.0.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.4-rc.1) (2019-03-13) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.3...v1.0.4-rc.1) + + * Update from Weblate + [\#9152](https://github.com/vector-im/riot-web/pull/9152) + * Use modern Yarn version on Travis CI + [\#9151](https://github.com/vector-im/riot-web/pull/9151) + * Switch to `yarn` for dependency management + [\#9132](https://github.com/vector-im/riot-web/pull/9132) + * Update from Weblate + [\#9104](https://github.com/vector-im/riot-web/pull/9104) + * Don't copy the 32 bit linux deb + [\#9075](https://github.com/vector-im/riot-web/pull/9075) + * Change olm dependency to normal dep + [\#9068](https://github.com/vector-im/riot-web/pull/9068) + * Add modular.im hosting link to electron app config + [\#9047](https://github.com/vector-im/riot-web/pull/9047) + * Nudge karma to 3.1.2 + [\#8991](https://github.com/vector-im/riot-web/pull/8991) + * Add support for localConfig at $appData/config.json. + [\#8983](https://github.com/vector-im/riot-web/pull/8983) + Changes in [1.0.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.3) (2019-03-06) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2...v1.0.3) From bf721d031a5b2df08399f39a9844c96c100d5283 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 15:00:17 +0000 Subject: [PATCH 06/36] v1.0.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b88c744b..c3d9c0fd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.3", + "version": "1.0.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From b40ed7cb11dd934153d18f2a30fe66ec8a6fbbb8 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Wed, 13 Mar 2019 14:43:17 -0500 Subject: [PATCH 07/36] Update Electron help menu link Signed-off-by: Aaron Raimist --- electron_app/src/vectormenu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron_app/src/vectormenu.js b/electron_app/src/vectormenu.js index ce35cf7c..a8f998be 100644 --- a/electron_app/src/vectormenu.js +++ b/electron_app/src/vectormenu.js @@ -57,8 +57,8 @@ const template = [ role: 'help', submenu: [ { - label: 'riot.im', - click() { shell.openExternal('https://riot.im/'); }, + label: 'Riot Help', + click() { shell.openExternal('https://about.riot.im/help'); }, }, ], }, From df164d7489b330bc3e6deaa15a095e301073690a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 14:10:12 -0600 Subject: [PATCH 08/36] Remove node 8.x from the build matrix We don't support Node 8 anymore. Also the build is broken. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5149c81d..591dc4bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,10 @@ node_js: # Current status of node versions: https://github.com/nodejs/LTS/ # We don't work with node 6 because it doesn't support package-lock # files which we need to avoid the broken version of base-x - - 8 + # + # Our minimum supported version is Node 10. - 10 + - 11 addons: chrome: stable before_install: From 789a0da176f9f7b07602a56390fd6c5cfef5da9b Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 14:39:10 -0600 Subject: [PATCH 09/36] Remove irrelevant warning --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 591dc4bf..0047d752 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,6 @@ node_js: # make sure we work with a range of node versions. # # Current status of node versions: https://github.com/nodejs/LTS/ - # We don't work with node 6 because it doesn't support package-lock - # files which we need to avoid the broken version of base-x - # # Our minimum supported version is Node 10. - 10 - 11 From b6cdaa859718c3f18ecb9152c9ca20ef83922013 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 18:25:06 -0600 Subject: [PATCH 10/36] Add a basic BuildKite :pipeline: --- .buildkite/pipeline.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .buildkite/pipeline.yaml diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml new file mode 100644 index 00000000..195e3248 --- /dev/null +++ b/.buildkite/pipeline.yaml @@ -0,0 +1,21 @@ +steps: + - label: ":eslint: Lint" + command: + - "./scripts/fetch-develop.deps.sh --depth 1" + - "yarn install" + - "yarn lint" + plugins: + - docker#v3.0.1: + image: "node:10" + + - label: ":karma: Tests" + command: + #- "sudo apt-get install git" + - "./scripts/fetch-develop.deps.sh --depth 1" + - "yarn install" + - "yarn test" + plugins: + - docker#v3.0.1: + image: "node:10" + #image: "buildkite/puppeteer:v1.11.0" + From 0b4c52c0326e74136bf79bb29c16b13d1cb67d11 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 18:25:17 -0600 Subject: [PATCH 11/36] Remove Travis (CI) We're using BuildKite now --- .travis.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0047d752..00000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -# we need trusty for the chrome addon -dist: trusty - -# we don't need sudo, so can run in a container, which makes startup much -# quicker. -# -# unfortunately we do temporarily require sudo as a workaround for -# https://github.com/travis-ci/travis-ci/issues/8836 -sudo: required - -language: node_js -node_js: - # make sure we work with a range of node versions. - # - # Current status of node versions: https://github.com/nodejs/LTS/ - # Our minimum supported version is Node 10. - - 10 - - 11 -addons: - chrome: stable -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0 - - export PATH=$HOME/.yarn/bin:$PATH -install: - # clone the deps with depth 1: we know we will only ever need that one - # commit. - - scripts/fetch-develop.deps.sh --depth 1 && yarn install -script: - - CHROME_BIN='/usr/bin/google-chrome-stable' yarn test - - yarn lint From f6d4c6a5a361ddec5d4a808dace243033d35b3bb Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 18:30:45 -0600 Subject: [PATCH 12/36] Lint doesn't need develop deps --- .buildkite/pipeline.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 195e3248..8d0e7068 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -1,7 +1,6 @@ steps: - label: ":eslint: Lint" command: - - "./scripts/fetch-develop.deps.sh --depth 1" - "yarn install" - "yarn lint" plugins: From 1fb8b23d4c4cc22e6da91ab8999bb09260cf809e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 19:46:52 -0600 Subject: [PATCH 13/36] Set up BuildKite for Chrome --- .buildkite/pipeline.yaml | 11 ++++++++--- karma.conf.js | 4 ++-- package.json | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 8d0e7068..9ccd4abf 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -9,12 +9,17 @@ steps: - label: ":karma: Tests" command: - #- "sudo apt-get install git" + # Install chrome + - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -" + - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'" + - "apt-get update" + - "apt-get install -y google-chrome-stable" + # Run tests - "./scripts/fetch-develop.deps.sh --depth 1" - "yarn install" - "yarn test" + env: + CHROME_BIN: "/usr/bin/google-chrome-stable" plugins: - docker#v3.0.1: image: "node:10" - #image: "buildkite/puppeteer:v1.11.0" - diff --git a/karma.conf.js b/karma.conf.js index 4cb9a729..610541a5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -138,10 +138,10 @@ module.exports = function (config) { ], customLaunchers: { - 'ChromeHeadless': { + 'VectorChromeHeadless': { base: 'Chrome', flags: [ - // '--no-sandbox', + '--no-sandbox', // See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md '--headless', '--disable-gpu', diff --git a/package.json b/package.json index e2af18b5..0083244c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "lintall": "eslint src/ test/", "clean": "rimraf lib webapp electron_app/dist", "prepare": "yarn clean && yarn build:compile", - "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless", + "test": "karma start --single-run=true --autoWatch=false --browsers VectorChromeHeadless", "test-multi": "karma start" }, "dependencies": { @@ -117,7 +117,7 @@ "html-webpack-plugin": "^3.2.0", "json-loader": "^0.5.3", "karma": "^3.1.2", - "karma-chrome-launcher": "^0.2.3", + "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-junit-reporter": "^2.0.0", "karma-logcapture-reporter": "0.0.1", diff --git a/yarn.lock b/yarn.lock index 55e137cf..d77298aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5336,10 +5336,10 @@ jsx-ast-utils@^2.0.1: dependencies: array-includes "^3.0.3" -karma-chrome-launcher@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz#4c6d700d163a9d34c618efd87918be49e7a4a8c9" - integrity sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk= +karma-chrome-launcher@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf" + integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w== dependencies: fs-access "^1.0.0" which "^1.2.1" From ef6313fbb46e94b80764ef129c443456a705b7ef Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 22:23:28 -0600 Subject: [PATCH 14/36] Use the right CI branch --- .buildkite/pipeline.yaml | 1 + scripts/fetch-develop.deps.sh | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 9ccd4abf..55e65b05 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -23,3 +23,4 @@ steps: plugins: - docker#v3.0.1: image: "node:10" + propagate-environment: true diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 7fbb76f4..5c9c7848 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -40,9 +40,8 @@ function dodep() { # Try the PR author's branch in case it exists on the deps as well. # Try the target branch of the push or PR. # Use the default branch as the last resort. - if [[ "$TRAVIS" == true ]]; then - clone $org $repo $TRAVIS_PULL_REQUEST_BRANCH || - clone $org $repo $TRAVIS_BRANCH || + if [[ "$BUILDKITE" == true ]]; then + clone $org $repo $BUILDKITE_BRANCH || clone $org $repo $defbranch || return $? else From 49165a09c32c35c32bcc1e576d2a3856eab379cc Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 14 Mar 2019 11:59:30 +0200 Subject: [PATCH 15/36] Update version number in issue templates Signed-off-by: Mikaela Suomalainen --- .github/ISSUE_TEMPLATE.md | 2 +- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ba4adf39..a2042975 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -43,4 +43,4 @@ For the web app: For the desktop app: - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc? -- **Version**: 0.x.y +- **Version**: 1.x.y diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6caffdb0..687e45d4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -52,4 +52,4 @@ For the web app: For the desktop app: - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc? -- **Version**: 0.x.y +- **Version**: 1.x.y From e47728e0e4fb74dd5e9fd4f6dba720a4db75327c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 14 Mar 2019 12:59:57 -0600 Subject: [PATCH 16/36] Declare the officially supported browsers in the README Fixes https://github.com/vector-im/riot-web/issues/8701 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 764a24aa..b8483710 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ Riot Riot (formerly known as Vector) is a Matrix web client built using the [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk). +Riot is officially supported on the web in modern versions of Chrome, Firefox, and Safari. Other browsers may work, however +official support is not provided. + Getting Started =============== From bccdd608895629bd77ae472ed24700630b59e8b3 Mon Sep 17 00:00:00 2001 From: Tom Lant Date: Fri, 15 Mar 2019 14:24:45 +0000 Subject: [PATCH 17/36] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .../user-interface-or-usability-bug-report.md | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 687e45d4..ffca51c6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Create a report to help us improve title: '' -labels: '' +labels: bug assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md new file mode 100644 index 00000000..df9cfe4f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md @@ -0,0 +1,57 @@ +--- +name: User Interface or Usability Bug report +about: Please include screenshots in UI/UX bug reports +title: '' +labels: '' +assignees: '' + +--- + + + + + + + +### Description + +Describe here the problem that you are experiencing, or the feature you are requesting. + +### Steps to reproduce + +- For bugs, list the steps +- that reproduce the bug +- using hyphens as bullet points + +Describe how what happens differs from what you expected. + +Log: sent/not sent? + + + +### Version information + + + +- **Platform**: web (in-browser) or desktop? + +For the web app: + +- **Browser**: Chrome, Safari, Firefox? which version? +- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc? +- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web? + +For the desktop app: + +- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc? +- **Version**: 1.x.y From df7b61788103456b100f50320be21b255167cf48 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 10:23:43 -0600 Subject: [PATCH 18/36] Fix downstream branch fetching We should be giving the PR the best possible chance at passing the build. --- scripts/fetch-develop.deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 5c9c7848..d824be95 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -42,6 +42,7 @@ function dodep() { # Use the default branch as the last resort. if [[ "$BUILDKITE" == true ]]; then clone $org $repo $BUILDKITE_BRANCH || + clone $org $repo $BUILDKITE_PULL_REQUEST_BASE_BRANCH || clone $org $repo $defbranch || return $? else From 631fcb0ad2314c010820325101fcf362a6b1cba8 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 11:43:00 -0600 Subject: [PATCH 19/36] Cross-promote mobile apps --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b8483710..51ce224a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ Riot Riot (formerly known as Vector) is a Matrix web client built using the [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk). Riot is officially supported on the web in modern versions of Chrome, Firefox, and Safari. Other browsers may work, however -official support is not provided. +official support is not provided. For accessing Riot on an Android or iOS device, check out [riot-android](https://github.com/vector-im/riot-android) +and [riot-ios](https://github.com/vector-im/riot-ios) - riot-web does not support mobile devices. Getting Started =============== From 95611d2c12d62e43e7cd8b85f4d24279922a0a67 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 15 Mar 2019 17:53:20 +0000 Subject: [PATCH 20/36] Update README.md grammar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 967fea3a..993466cb 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,7 @@ To change the config.json for the desktop app, create a config file which will b + `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux + `~Library/Application Support/$NAME/config.json` on macOS -Where `$NAME` is typically Riot, unless you use `--profile $PROFILE` then its `Riot-$PROFILE`. +In the paths above, `$NAME` is typically `Riot`, unless you use `--profile $PROFILE` in which case it becomes `Riot-$PROFILE`. Development =========== From fae63d04e0142e03dbcaa13f92b2d8878060f828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miche=C3=A1l=20=C3=93=20h=C3=93g=C3=A1in?= Date: Sun, 17 Mar 2019 01:41:44 +0000 Subject: [PATCH 21/36] Added translation using Weblate (Irish) --- src/i18n/strings/ga.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/ga.json diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/i18n/strings/ga.json @@ -0,0 +1 @@ +{} From 723d28e5497f80546160607dc7fce3062f26c4b2 Mon Sep 17 00:00:00 2001 From: Gene Wood Date: Fri, 15 Mar 2019 17:11:14 +0000 Subject: [PATCH 22/36] Translated using Weblate (English (United States)) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/en_US/ --- src/i18n/strings/en_US.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index e5b060cf..ce05de0f 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -35,5 +35,12 @@ "Riot/Web & Desktop chat": "Riot/Web & Desktop chat", "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk chat", "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.", - "Co-ordination for Riot translators": "Co-ordination for Riot translators" + "Co-ordination for Riot translators": "Co-ordination for Riot translators", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.", + "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.", + "Sign In": "Sign In", + "Create Account": "Create Account", + "Need help?": "Need help?", + "Explore rooms": "Explore rooms", + "Room Directory": "Room Directory" } From 8b3f473b60734d9eaf8ff4b42981ca7d7f44698c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miche=C3=A1l=20=C3=93=20h=C3=93g=C3=A1in?= Date: Sun, 17 Mar 2019 01:56:19 +0000 Subject: [PATCH 23/36] Translated using Weblate (Irish) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/ga/ --- src/i18n/strings/ga.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json index 0967ef42..dacb5c70 100644 --- a/src/i18n/strings/ga.json +++ b/src/i18n/strings/ga.json @@ -1 +1,21 @@ -{} +{ + "Riot Desktop on %(platformName)s": "Leagan gnáthríomhaire Riot ar %(platformName)s", + "Unknown device": "Gléas nár aithníodh", + "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s trí %(browserName)s ar %(osName)s", + "You need to be using HTTPS to place a screen-sharing call.": "Ní mór HTTPS a úsáid chun glaoch ina dhéantar an scáileán a roinnt a chuir.", + "powered by Matrix": "á thiomáint le Matrix", + "Custom Server Options": "Socruithe do fhreastalaí saincheaptha", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Is féidir na socruithe do fhreastalaí saincheaptha a úsáid chun síniú isteach le freastalaí Matrix eile tríd URL freastalaí ar leith a sholáthar. Cuirfidh sé seo ar do chumas Riot a úsáid le cuntas Matrix atá ar taifead ag freastalaí difriúil.", + "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Freisin is féidir freastalaí aitheantais saincheaptha a úsáid, ach le seo ní bheidh tú in ann cuireadh a thabhairt do dhaoine tríd seoladh ríomhphoist a sholáthar, nó glacadh le cuireadh trí ríomhphoist ach an oiread.", + "Dismiss": "Cuir uait", + "Welcome to Riot.im": "Fáilte chuig Riot.im", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Meán comhrá agus comhoibriú neamhláraithe agus criptithe á thiomáint le [matrix]", + "Sign In": "Sínigh Isteach", + "Create Account": "Déan cuntas a chruthú", + "Need help?": "An bhfuil cabhair uait?", + "Chat with Riot Bot": "Labhair le Riot Bot", + "Explore rooms": "Breathnaigh thart ar na seomraí", + "Room Directory": "Eolaire na Seomraí", + "Search the room directory": "Cuardaigh eolaire na seomraí", + "Get started with some tips from Riot Bot!": "Tosaigh le nod ó Riot Bot!" +} From 59ebb15fe9b4ec46cc4adcbd313e5d0c19bcbaf8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:11:09 +0000 Subject: [PATCH 24/36] Released js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c3d9c0fd..40fab94d 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.0.2-rc.1", - "matrix-react-sdk": "1.0.4-rc.1", + "matrix-js-sdk": "1.0.2", + "matrix-react-sdk": "1.0.4", "modernizr": "^3.6.0", "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz", "prop-types": "^15.6.2", From 5254cef98066377405806734527cc0ad224c4e31 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:11:52 +0000 Subject: [PATCH 25/36] v1.0.4 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 2b2a71af..cb3c9092 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.0.4-rc.1", + "version": "1.0.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 900141634336c8008d3982689da02cbe1ec83c3a Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:16:23 +0000 Subject: [PATCH 26/36] Prepare changelog for v1.0.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4d1ebe..33d26251 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.4](https://github.com/vector-im/riot-web/releases/tag/v1.0.4) (2019-03-18) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4-rc.1...v1.0.4) + + * No changes since rc.1 + Changes in [1.0.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.4-rc.1) (2019-03-13) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.3...v1.0.4-rc.1) From dceb2dd67129831d98cfc72c7f55a699a7fa8662 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:16:23 +0000 Subject: [PATCH 27/36] v1.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40fab94d..2984bcf1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.4-rc.1", + "version": "1.0.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 2de1f375facd0057bf155ab5c2e3f8323574cc6d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 16:27:01 +0000 Subject: [PATCH 28/36] Update yarn.lock which wasn't updated at release time --- yarn.lock | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0911d7df..fc93c1a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4105,7 +4105,6 @@ gauge@~2.7.3: "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279", gemini-scrollbar@matrix-org/gemini-scrollbar#b302279: version "1.4.3" - uid b302279810d05319ac5ff1bd34910bff32325c7b resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/b302279810d05319ac5ff1bd34910bff32325c7b" get-caller-file@^1.0.1: @@ -5741,10 +5740,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w= -matrix-js-sdk@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.1.tgz#783efc501e2521997869cfe8e719134d9e10a45c" - integrity sha512-+ErnXHfkxOoRHUYbY/R+2ZHvPKdPCx/eoYjb2Oy7L9pBqCNllI0WRVsro6oqRJQs0krVP8blyIjWOJynWSw96g== +matrix-js-sdk@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.2.tgz#482d8d2076c7565cf7354722e96c9971e372182a" + integrity sha512-4WCBJFSoOLelHi7IUAcVxPQF+gTc/i9NUKZ77qwUfcZVED8VKTIyWZnwpeLgocK5gAOJV9fkAyO5mny9SkZaGg== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5766,10 +5765,10 @@ matrix-mock-request@^1.2.2: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.0.3.tgz#e2d027a68e47461abcad779219b028eee9399a53" - integrity sha512-Igc9ChLpRbN0E/bwA3HMhiYo2c21RA7dQ+eoZ9XEN6vh87ZJz0rUidqmAdvgZQycxW1lZWQ8Aj7/kefHeRswDA== +matrix-react-sdk@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.0.4.tgz#cf6ef3d68f29af8ba590ceea74b20979522ef9cb" + integrity sha512-7qpnyXNnGvO/i+TPMoYayI4rWy6+hxnpjInx5Odgkw7PhCiapiYRU4poQsgVnOomkihrUWxuksWUmnkGhJ6O+Q== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5795,11 +5794,12 @@ matrix-react-sdk@1.0.3: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "1.0.1" + matrix-js-sdk "1.0.2" optimist "^0.6.1" pako "^1.0.5" prop-types "^15.5.8" qrcode-react "^0.1.16" + qs "^6.6.0" querystring "^0.2.0" react "^15.6.0" react-addons-css-transition-group "15.3.2" @@ -7122,6 +7122,11 @@ qs@6.5.2, qs@^6.5.2, qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +qs@^6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2" + integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA== + querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" From f5c28a19e1b248750af650a076a4fc962b2cb7ae Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 19 Mar 2019 16:41:28 +0000 Subject: [PATCH 29/36] Support CI for matching branches on forks Currently, people with push access to the main Riot repos can push matching branch names to Riot and the SDKs, and CI will test all the branches together. This change allows contributors to access the same ability when submitting several matching PRs from their fork of each repo. Part of https://github.com/vector-im/riot-web/issues/9041 --- scripts/fetch-develop.deps.sh | 36 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index d824be95..2c5a5cf7 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -6,7 +6,7 @@ # the branch the current checkout is on, use that branch. Otherwise, # use develop. -set -e +set -ex GIT_CLONE_ARGS=("$@") [ -z "$defbranch" ] && defbranch="develop" @@ -33,27 +33,39 @@ function clone() { } function dodep() { - org=$1 - repo=$2 - rm -rf $repo + deforg=$1 + defrepo=$2 + rm -rf $defrepo # Try the PR author's branch in case it exists on the deps as well. # Try the target branch of the push or PR. # Use the default branch as the last resort. if [[ "$BUILDKITE" == true ]]; then - clone $org $repo $BUILDKITE_BRANCH || - clone $org $repo $BUILDKITE_PULL_REQUEST_BASE_BRANCH || - clone $org $repo $defbranch || + # If BUILDKITE_BRANCH is set, it will contain either: + # * "branch" when the author's branch and target branch are in the same repo + # * "author:branch" when the author's branch is in their fork + # We can split on `:` into an array to check. + BUILDKITE_BRANCH_ARRAY=(${BUILDKITE_BRANCH//:/ }) + if [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then + prAuthor=${BUILDKITE_BRANCH_ARRAY[0]} + prBranch=${BUILDKITE_BRANCH_ARRAY[1]} + else + prAuthor=$deforg + prBranch=$BUILDKITE_BRANCH + fi + clone $prAuthor $defrepo $prBranch || + clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH || + clone $deforg $defrepo $defbranch || return $? else - clone $org $repo $ghprbSourceBranch || - clone $org $repo $GIT_BRANCH || - clone $org $repo `git rev-parse --abbrev-ref HEAD` || - clone $org $repo $defbranch || + clone $deforg $defrepo $ghprbSourceBranch || + clone $deforg $defrepo $GIT_BRANCH || + clone $deforg $defrepo `git rev-parse --abbrev-ref HEAD` || + clone $deforg $defrepo $defbranch || return $? fi - echo "$repo set to branch "`git -C "$repo" rev-parse --abbrev-ref HEAD` + echo "$defrepo set to branch "`git -C "$defrepo" rev-parse --abbrev-ref HEAD` } ############################## From 52ad757cf46a670f8beaa8476691b3d24cd5107b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 20 Mar 2019 18:05:02 +0000 Subject: [PATCH 30/36] Switch to `git` protocol for CI dependencies If you try to clone a repo that doesn't exist via `https`, `git` will prompt for auth credentials and hang forever. Using `git` avoids this and fails immediately instead, which is what we want for a missing repo. Part of https://github.com/vector-im/riot-web/issues/9221 --- scripts/fetch-develop.deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 2c5a5cf7..e7419718 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -25,7 +25,7 @@ function clone() { if [ -n "$branch" ] then echo "Trying to use $org/$repo#$branch" - git clone https://github.com/$org/$repo.git $repo --branch $branch \ + git clone git://github.com/$org/$repo.git $repo --branch $branch \ "${GIT_CLONE_ARGS[@]}" return $? fi From 930ac3ae18e622055dad1b3860d8f768c38b9e5f Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Mar 2019 21:33:25 +0000 Subject: [PATCH 31/36] Add log grouping to buildkite It mostly truncates the log anyway but what are you gonna do --- .buildkite/pipeline.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 55e65b05..20ec0ab9 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -10,13 +10,16 @@ steps: - label: ":karma: Tests" command: # Install chrome + - "echo '--- Installing Chrome'" - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -" - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'" - "apt-get update" - "apt-get install -y google-chrome-stable" # Run tests + - "echo '--- Fetching Dependencies'" - "./scripts/fetch-develop.deps.sh --depth 1" - "yarn install" + - "echo '+++ Running Tests'" - "yarn test" env: CHROME_BIN: "/usr/bin/google-chrome-stable" From 4792eb4aa4ace3a2d2308aa9d38d7d0908b08e0b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 21 Mar 2019 11:31:12 +0100 Subject: [PATCH 32/36] bump matrix-react-sdk version to 1.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2984bcf1..02bb350f 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.0.2", - "matrix-react-sdk": "1.0.4", + "matrix-react-sdk": "1.0.5", "modernizr": "^3.6.0", "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz", "prop-types": "^15.6.2", From 0dd1a7b309f6afbe1ea39252c09d0c23cd534700 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 21 Mar 2019 11:34:17 +0100 Subject: [PATCH 33/36] v1.0.5 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index cb3c9092..158783bd 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.0.4", + "version": "1.0.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From a84a599f16d3085ab7c8f3d8029bce5251e32e89 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 21 Mar 2019 11:37:35 +0100 Subject: [PATCH 34/36] Prepare changelog for v1.0.5 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33d26251..7308b0fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.5](https://github.com/vector-im/riot-web/releases/tag/v1.0.5) (2019-03-21) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4...v1.0.5) + + * Hotfix for [\#9205](https://github.com/vector-im/riot-web/issues/9205) disabling jump prevention for typing notifications, while we're reworking this functionally to enable it again soon. + Changes in [1.0.4](https://github.com/vector-im/riot-web/releases/tag/v1.0.4) (2019-03-18) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4-rc.1...v1.0.4) From c8692473a42dcbd52f93c014e47bf95726d676cd Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 21 Mar 2019 11:37:35 +0100 Subject: [PATCH 35/36] v1.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02bb350f..8bdfcd30 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.4", + "version": "1.0.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 8b097bcd8c08bb0f0deee82f1b1204ba72f2a16b Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 21 Mar 2019 11:00:06 -0600 Subject: [PATCH 36/36] Use medium agents for the more resource intensive builds --- .buildkite/pipeline.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 20ec0ab9..8b658be0 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -8,6 +8,10 @@ steps: image: "node:10" - label: ":karma: Tests" + agents: + # We use a medium sized instance instead of the normal small ones because + # webpack loves to gorge itself on resources. + queue: "medium" command: # Install chrome - "echo '--- Installing Chrome'"