PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #3845 from matrix-org/travis/fix-develop

Browse source 
Fix linter and tests on develop
This commit is contained in:
Travis Ralston 2020-01-15 10:38:08 -07:00 committed by GitHub
commit c2b3661a69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.eslintrc.js
View file

@ -5,7 +5,10 @@ const path = require('path');
// but only if they come from a module that starts with eslint-config- // but only if they come from a module that starts with eslint-config-
// So we load the filename directly (and it could be in node_modules/ // So we load the filename directly (and it could be in node_modules/
// or or ../node_modules/ etc) // or or ../node_modules/ etc)
const matrixJsSdkPath = path.dirname(require.resolve('matrix-js-sdk')); //
// We add a `..` to the end because the js-sdk lives out of lib/, but the eslint
// config is at the project root.
const matrixJsSdkPath = path.join(path.dirname(require.resolve('matrix-js-sdk')), '..');
module.exports = { module.exports = {
parser: "babel-eslint", parser: "babel-eslint",

1
scripts/ci/install-deps.sh
View file

@ -7,6 +7,7 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk
pushd matrix-js-sdk pushd matrix-js-sdk
yarn link yarn link
yarn install yarn install
yarn build
popd popd
yarn link matrix-js-sdk yarn link matrix-js-sdk