Commit Graph

35 Commits (4bb9f2ed7b5dbb002083651889a9a30d5666dfb6)

Author SHA1 Message Date
Michael Telatynski f0ee7f7905
Merge matrix-react-sdk into element-web
Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-15 15:32:09 +01:00
David Baker 49375dc94b Switch to element's react-sdk fork 2024-09-06 11:36:04 +01:00
Michael Telatynski ddc2932541
Use frozen lockfile instead of pure lockfile on yarn install (#25009) 2023-03-31 14:52:29 +00:00
Robin 46c005a5d3
Don't hardcode /bin/bash in scripts (#23740)
Some operating systems, such as NixOS, don't place binaries in /bin. The appropriate cross-platform method is to use /usr/bin/env.
2022-11-09 09:58:06 -05:00
Michael Telatynski 341b0b469e
Make bash scripts exit on error rather than continue (#23467) 2022-10-12 16:15:51 +01:00
Travis Ralston 9c23f6c476 Step 14: Remove reskindex 2022-03-28 15:26:22 -06:00
J. Ryan Stinnett 6c1fc8e903
Disable Git interactive auth when fetching deps (#20484)
This is important for branch testing, especially via HTTPS.
2022-01-11 12:48:49 +00:00
Travis Ralston 2617b424ce
Fix git protocol usage (#20464)
Prevents this:
```
+ git clone git://github.com/matrix-org/matrix-js-sdk.git matrix-js-sdk --branch develop --depth 1
Cloning into 'matrix-js-sdk'...
fatal: remote error:
  The unauthenticated git protocol on port 9418 is no longer supported.
Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information.
```
2022-01-11 09:06:18 +00:00
Germain Souquet 6e15d0f5e8 Do not generate a lockfile when running in CI 2021-07-07 16:10:40 +02:00
J. Ryan Stinnett 48884c711b Cloned deps no longer need so much building 2020-12-18 15:32:56 +00:00
J. Ryan Stinnett 7262b372b3 Remove references to Travis CI
Also cleans up a Riot reference as well

Part of https://github.com/vector-im/element-web/issues/15098
2020-09-10 10:16:29 +01:00
Travis Ralston a978a6734f Fix CI tests
There's a bunch of generated files that webpack relies on to work, and Karma works off webpack. To make both happy we've added
a new `build:genfiles` script which takes care of this for us. We also have to install and build our other layers to get the
same effect (like generating the react-sdk's component index, while we still have one).

This commit also fixes all the imports in the tests because they were just wrong. They should have been caught in the ES6ification
earlier, but were missed.
2020-01-13 20:40:00 -07:00
J. Ryan Stinnett 52ad757cf4 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
2019-03-20 18:06:18 +00:00
J. Ryan Stinnett f5c28a19e1 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
2019-03-19 18:17:27 +00:00
Travis Ralston df7b617881 Fix downstream branch fetching
We should be giving the PR the best possible chance at passing the build.
2019-03-15 10:23:43 -06:00
Travis Ralston ef6313fbb4 Use the right CI branch 2019-03-13 22:44:28 -06:00
J. Ryan Stinnett 1312ba537a Update scripts and docs to use `yarn` where appropriate
Most `npm` operations are replaced with `yarn`, which generally has better
behavior. However, steps like publish that write to the NPM registry are left to
`npm`, which currently handles these tasks best.
2019-03-12 11:06:57 +00:00
David Baker a28691f14d Add returns to fetch-develop-deps
These look necessary for https://github.com/vector-im/riot-web/pull/8225
to work - the build is failing on jenkins
2019-01-23 11:40:21 +00:00
J. Ryan Stinnett cf150fc575 Try fetching more branches for PRs
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need matrix-react-sdk to also be experimental.
2019-01-22 21:28:09 -06:00
Travis Ralston c6da122e41 Fix npm link in the build script 2018-09-17 17:57:27 -06:00
Travis Ralston 67e9606d55 Reduce the number of terminals required to build riot-web to 1
A step towards a real solution for https://github.com/vector-im/riot-web/issues/7305

This approach makes use of `npm link` to remove the use of symlinks in the build process. The build process has also been altered to invoke the build process of each underlying SDK (react, js). This means that one can now `npm link` and `npm start` and have a working environment. 

At the same time, parallelshell was dropped due to lack of maintenance from the maintainer.
2018-09-17 17:50:03 -06:00
Richard van der Hoff 7b024751d1 fetch-develop-deps: avoid breaking js-sdk
do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build.
2017-08-08 09:50:49 +01:00
David Baker 9c94f2ac14 Use bash magic instead of sed 2017-06-07 10:39:46 +01:00
David Baker b0486e333d Chop off 'origin/'
when figuring out what branch we're on
2017-06-07 10:35:08 +01:00
Richard van der Hoff 81c0c7bd4f Various tweaks to fetch-develop-deps
* tell git to checkout the right branch, rather than cloning and then changing.
* clone with depth 1 under travis, to save time.
* less pushd/popd, which print out confusing text - use `cd` in a subshell
  instead. (and just avoid it where possible).
* add some markers to the output to let travis roll it up.
2017-06-01 18:18:46 +01:00
Richard van der Hoff 89e5c4f8ae Fix fetch-develop-deps.sh
This got broken by https://github.com/vector-im/riot-web/pull/4120 so that it
didn't work on a clean git clone.
2017-05-31 23:50:06 +01:00
Richard van der Hoff 0e742cec27 scripts/fetch-develop.deps.sh: set -e (#4120)
... so that when the git clone fails, it doesn't plough on regardless.
2017-05-31 15:37:30 +01:00
David Baker 96393f69b6 Remove old versions before linking react/js sdk 2017-05-26 22:37:44 +01:00
David Baker d7f1e01cfa Don't fail if reskindex symlink exists 2017-05-19 14:47:44 +01:00
David Baker a9a4b1c44e Get branch from various CI env vars
So we hopefully get the right branch for PRs from the same repo
(but not forks).

From @t3chguy's comment (tweaked a bit)
2017-05-18 11:05:19 +01:00
David Baker c929cb1337 Do I mean bash? Probably 2017-05-17 18:21:58 +01:00
David Baker 18afbc5bec Make dep install script work 2017-05-17 18:14:28 +01:00
David Baker 60d33f50a7 Create node_modules if it doesn't exist 2017-05-17 16:19:19 +01:00
David Baker 94ac4bf490 Use fetch dep script in jenkins script 2017-05-17 16:17:08 +01:00
David Baker fac8906102 Add script to fetch correct dep branches
Fetch branches of js-sdk and react-sdk that match the current
branch name, if they exist. This will mostly be used in the
automated tests.
2017-05-17 16:11:34 +01:00